- Recode as UTF-8, fix argument order find with -depth, etc.

perl-Sort-Versions.spec

@@ -1,12 +1,12 @@
 Name: 		perl-Sort-Versions
 Version: 	1.5
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 Summary: 	Perl module for sorting of revision-like numbers 
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Sort-Versions/
 Source0: 	http://www.cpan.org/modules/by-module/Sort/Sort-Versions-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch: 	noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -25,6 +25,9 @@ undoubtedly be found.
 
 %prep
 %setup -q -n Sort-Versions-%{version}
+for f in Changes Versions.pm; do
+	iconv -f iso-8859-1 -t utf-8 <$f >${f}_ && mv ${f}_ $f
+done
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -33,8 +36,9 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -depth \
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+	-type f -name .packlist -exec rm -f {} ';' -o \
+	-type d -empty -exec rmdir {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %clean
@@ -50,6 +54,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 16 2009 Stepan Kasal <skasal@redhat.com> - 1.5-10
+- Recode as UTF-8, fix argument order find with -depth (both by Paul Howarth)
+- Other minor cleanups
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild