packages: translate-toolkit/translate-toolkit.spec, translate-toolkit/unbas...

Thu May 13 19:59:33 CEST 2010

Author: glen                         Date: Thu May 13 17:59:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.7.0

---- Files affected:
packages/translate-toolkit:
   translate-toolkit.spec (1.5 -> 1.6) , unbash.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/translate-toolkit/translate-toolkit.spec
diff -u packages/translate-toolkit/translate-toolkit.spec:1.5 packages/translate-toolkit/translate-toolkit.spec:1.6

--- packages/translate-toolkit/translate-toolkit.spec:1.5	Tue May 11 10:50:00 2010
+++ packages/translate-toolkit/translate-toolkit.spec	Thu May 13 19:59:27 2010
@@ -8,17 +8,19 @@
 
 Summary:	Tools to assist with translation and software localization
 Name:		translate-toolkit
-Version:	1.6.0
-Release:	2
+Version:	1.7.0
+Release:	1
 License:	GPL v2+
 Group:		Development/Tools
 URL:		http://translate.sourceforge.net/wiki/toolkit/index
 Source0:	http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	52e4409e72565bb49e7efad235b4a213
+# Source0-md5:	70a826257adbffab849556c2d50b8b48
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Patch0:		%{name}-stoplist.patch
 Patch1:		%{name}-langmodel_dir.patch
+Patch2:		unbash.patch
 BuildRequires:	python-devel
+BuildRequires:	checkbashisms
 BuildRequires:	sed >= 4.0
 # The following are needed for man page generation
 BuildRequires:	python-lxml
@@ -76,11 +78,10 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
-# none of them seem actually requiring bash
-sed -i -e '1s,#!/bin/bash,#!/bin/sh,' tools/po*
+%patch2 -p1
 
 %build
+checkbashisms tools/*
 %{__python} setup.py build
 
 %install
@@ -246,6 +247,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/05/13 17:59:27  glen
+- up to 1.7.0
+
 Revision 1.5  2010/05/11 08:50:00  glen
 - requires -> suggests; rel 2
 

================================================================
Index: packages/translate-toolkit/unbash.patch
diff -u /dev/null packages/translate-toolkit/unbash.patch:1.1
--- /dev/null	Thu May 13 19:59:33 2010
+++ packages/translate-toolkit/unbash.patch	Thu May 13 19:59:27 2010
@@ -0,0 +1,148 @@
+--- translate-toolkit-1.7.0/tools.orig/junitmsgfmt	2010-05-12 16:41:15.000000000 +0200
++++ translate-toolkit-1.7.0/tools/junitmsgfmt	2010-05-13 19:21:20.617544285 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2010 Zuza Software Foundation
+ #
+@@ -25,38 +25,38 @@
+ failures=0
+ successes=0
+ 
+-function failure {
++failure() {
+ 	pofile=$1
+ 	body=$(echo $body; echo "<testcase classname=\"$pofile\" name=\"msgfmt\" time=\"\">\n"; echo "<failure message=\"msgfmt failure\">$message</failure>\n</testcase>\n")
+ 	message=""
+ 	failures=$(($failures + 1))
+ }
+ 
+-function success {
++success() {
+ 	pofile=$1
+ 	body=$(echo $body; echo "<testcase classname=\"$pofile\" name=\"msgfmt\" time=\"\"></testcase>\n")
+ 	message=""
+ 	successes=$(($successes + 1))
+ }
+ 
+-function run_msgfmt {
++run_msgfmt() {
+ 	pofile=$1
+ 	exit_status=$(msgfmt -cv -o /dev/null $pofile 2>/dev/null > /dev/null; echo $?)
+-	message=$(msgfmt -cv -o /dev/null $pofile 2>/dev/stdout | while read i; do echo "$i\n" ; done)
++	message=$(msgfmt -cv -o /dev/null $pofile 2>/dev/stdout | while read i; do echo "$i"; echo "" ; done)
+ 	return $exit_status
+ }
+ 
+-function print_header {
++print_header() {
+         echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+ 	echo "<testsuite name=\"\" errors=\"0\" failures=\"$failures\" skips=\"0\" tests=\"$((failures + successes))\" time=\"\" >"
+ }
+ 
+-function print_body {
++print_body() {
+ 	cat -
+-	echo -e $body
++	echo $body
+ }
+ 
+-function print_footer {
++print_footer() {
+ 	cat -
+ 	echo "</testsuite>"
+ }
+--- translate-toolkit-1.7.0/tools.orig/pocommentclean	2008-10-31 16:58:36.000000000 +0100
++++ translate-toolkit-1.7.0/tools/pocommentclean	2010-05-13 19:21:20.617544285 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2005 Zuza Software Foundation
+ #
+--- translate-toolkit-1.7.0/tools.orig/pocompendium	2008-01-24 12:54:56.000000000 +0100
++++ translate-toolkit-1.7.0/tools/pocompendium	2010-05-13 19:21:20.621015064 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2004, 2005 Zuza Software Foundation
+ #
+@@ -24,7 +24,7 @@
+ # combined and marked fuzzy.
+ 
+ 
+-function print_usage() {
++print_usage() {
+ 	echo "Usage: `basename $0` [options] output.po <-d directory(s)|file(s)>"
+ 	echo "       The first parameter is the output file, standard output if the output file is '-'."
+ 	echo "       Any number of directories may be specified for input files."
+@@ -97,7 +97,7 @@
+ 
+ tmp_dir=`mktemp -d tmp.XXXXXXXXXX`
+ 
+-if [ $1 == "-d" ]; then
++if [ $1 = "-d" ]; then
+ 	shift
+ 	directories=$*
+ 	if [ $# -eq 0 ]; then
+--- translate-toolkit-1.7.0/tools.orig/pomigrate2	2009-07-21 21:40:54.000000000 +0200
++++ translate-toolkit-1.7.0/tools/pomigrate2	2010-05-13 19:21:20.621015064 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2004, 2005 Zuza Software Foundation
+ #
+@@ -22,7 +22,7 @@
+ # pomigrate2 - migrates PO files from an old version using new POT files.
+ 
+ 
+-function usage() {
++usage() {
+ 	echo "Usage `basename $0` [options] <product-old> <product-new> <product-templates>"
+         echo
+         echo "Options:"
+@@ -100,7 +100,7 @@
+ 
+ echo "** Migrating files... **"
+ pots=`cd $templates; find . -name "*.pot"`
+-if [ "$pots" == "" ]; then
++if [ "$pots" = "" ]; then
+ 	echo "No POT templates found in: $templates"
+ 	exit 1
+ fi
+--- translate-toolkit-1.7.0/tools.orig/popuretext	2010-01-12 14:02:34.000000000 +0100
++++ translate-toolkit-1.7.0/tools/popuretext	2010-05-13 19:21:20.621015064 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2005 Zuza Software Foundation
+ #
+@@ -28,7 +28,7 @@
+ fi
+ 
+ do_pot=0
+-if [ "$1" == "-P" ]; then
++if [ "$1" = "-P" ]; then
+ 	do_pot=1
+ 	shift
+ 	potdir=$1
+--- translate-toolkit-1.7.0/tools.orig/poreencode	2008-01-24 12:54:56.000000000 +0100
++++ translate-toolkit-1.7.0/tools/poreencode	2010-05-13 19:21:20.621015064 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2004 Zuza Software Foundation
+ #
+--- translate-toolkit-1.7.0/tools.orig/posplit	2007-02-01 11:40:17.000000000 +0100
++++ translate-toolkit-1.7.0/tools/posplit	2010-05-13 19:21:20.621015064 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 2004, 2007 Zuza Software Foundation
+ #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/translate-toolkit/translate-toolkit.spec?r1=1.5&r2=1.6&f=u

