don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
change license tag to "GPLv2"
This commit is contained in:
parent
1793db71aa
commit
6a0eda317b
77
convmv-1.10-tests.patch
Normal file
77
convmv-1.10-tests.patch
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
diff -up convmv-1.10/suite/dotests.sh.tests convmv-1.10/suite/dotests.sh
|
||||||
|
--- convmv-1.10/suite/dotests.sh.tests 2006-06-26 00:01:16.000000000 +0200
|
||||||
|
+++ convmv-1.10/suite/dotests.sh 2007-09-27 16:44:39.000000000 +0200
|
||||||
|
@@ -3,62 +3,63 @@
|
||||||
|
# you might want to change this to GNU find's full path:
|
||||||
|
FIND=find
|
||||||
|
FINDEXP="%P -- %l\n"
|
||||||
|
-for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
|
||||||
|
+
|
||||||
|
+for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" | sort > out-$dir ; done
|
||||||
|
#
|
||||||
|
echo smartness-test
|
||||||
|
rm -rf test.tmp
|
||||||
|
cp -r test test.tmp
|
||||||
|
../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
|
||||||
|
false
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test out.tmp > diff.tmp|| { echo "smartness-test failed." ; exit 1; }
|
||||||
|
#
|
||||||
|
echo double-utf8 test
|
||||||
|
../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test-utf8 out.tmp > diff.tmp|| { echo "double-utf8 test failed." ; exit 1; }
|
||||||
|
#
|
||||||
|
../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test out.tmp > diff.tmp|| { echo undo-double-utf8 test failed. ; exit 1; }
|
||||||
|
#
|
||||||
|
echo utf8-to-iso8859-15-test
|
||||||
|
rm -r test.tmp
|
||||||
|
cp -r test test.tmp
|
||||||
|
../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
|
||||||
|
#
|
||||||
|
echo iso8859-15-to-utf8-test
|
||||||
|
rm -r test.tmp
|
||||||
|
cp -r test-iso8859-15 test.tmp
|
||||||
|
../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
|
||||||
|
#
|
||||||
|
echo nfc-test
|
||||||
|
rm -r test.tmp
|
||||||
|
cp -r test test.tmp
|
||||||
|
../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
|
||||||
|
#
|
||||||
|
../convmv -f utf8 -t utf8 --nfc --notest -r test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test out.tmp > diff.tmp|| { echo nfc-test failed. ; exit 1; }
|
||||||
|
#
|
||||||
|
echo escaped-test
|
||||||
|
rm -r test.tmp
|
||||||
|
cp -r test-escaped test.tmp
|
||||||
|
../convmv --unescape --notest -r test.tmp
|
||||||
|
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
|
||||||
|
#
|
||||||
|
echo upper-test
|
||||||
|
rm -r test.tmp
|
||||||
|
cp -r test test.tmp
|
||||||
|
../convmv --upper -f utf8 --notest -r test.tmp
|
||||||
|
-$FIND TEST.TMP -printf "$FINDEXP" > out.tmp
|
||||||
|
+$FIND TEST.TMP -printf "$FINDEXP" | sort > out.tmp
|
||||||
|
diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }
|
||||||
|
|
||||||
|
echo All tests successful, cleaning up now ...
|
15
convmv.spec
15
convmv.spec
@ -1,13 +1,14 @@
|
|||||||
Summary: Convert filename encodings
|
Summary: Convert filename encodings
|
||||||
Name: convmv
|
Name: convmv
|
||||||
Version: 1.10
|
Version: 1.10
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: GPL
|
License: GPLv2
|
||||||
URL: http://j3e.de/linux/convmv
|
URL: http://j3e.de/linux/convmv
|
||||||
Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
|
Source0: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
|
||||||
BuildRequires: /usr/bin/md5sum
|
Patch0: convmv-1.10-tests.patch
|
||||||
|
BuildRequires: coreutils
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -17,6 +18,8 @@ of filenames, e.g. from Latin1 to UTF-8.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
tar -xf testsuite.tar
|
||||||
|
%patch0 -p1 -b .tests
|
||||||
|
|
||||||
%build
|
%build
|
||||||
md5sum -c MD5sums
|
md5sum -c MD5sums
|
||||||
@ -37,6 +40,10 @@ rm -rf %{buildroot}
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 27 2007 Nils Philippsen <nphilipp@redhat.com> - 1.10-3
|
||||||
|
- don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
|
||||||
|
- change license tag to "GPLv2"
|
||||||
|
|
||||||
* Mon Aug 28 2006 Nils Philippsen <nphilipp@redhat.com> - 1.10-2
|
* Mon Aug 28 2006 Nils Philippsen <nphilipp@redhat.com> - 1.10-2
|
||||||
- FC6 mass rebuild
|
- FC6 mass rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user