commit 2fff1ccc0813ee6457e1edcf2b6e8acc365418f9
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Tue Jan 10 13:20:19 2012 +0000
Spec clean-up
- Nobody else likes macros for commands
- Use a patch rather than scripted iconv to fix character encoding
- BR: perl(Carp) and perl(Digest::MD5)
Authen-DigestMD5-0.04-UTF8.patch | 27 ++++++++++++++++++
perl-Authen-DigestMD5.spec | 56 +++++++++++++++++++++----------------
2 files changed, 59 insertions(+), 24 deletions(-)
---
diff --git a/Authen-DigestMD5-0.04-UTF8.patch b/Authen-DigestMD5-0.04-UTF8.patch
new file mode 100644
index 0000000..ad37462
--- /dev/null
+++ b/Authen-DigestMD5-0.04-UTF8.patch
@@ -0,0 +1,27 @@
+--- Authen-DigestMD5/DigestMD5.pm.not-utf8
++++ Authen-DigestMD5/DigestMD5.pm
+@@ -314,11 +314,11 @@
+
+ =head1 AUTHOR
+
+-Salvador Fandi�E<lt>sfandino@xxxxxxxxxx<gt>
++Salvador Fandiño, E<lt>sfandino@xxxxxxxxxx<gt>
+
+ =head1 COPYRIGHT AND LICENSE
+
+-Copyright 2003 by Salvador Fandi�++Copyright 2003 by Salvador Fandiño.
+
+ Portions of this module have been copied from the L<Authen::SASL>
+ package by Graham Barr.
+--- Authen-DigestMD5/README.not-utf8
++++ Authen-DigestMD5/README
+@@ -20,7 +20,7 @@
+
+ COPYRIGHT AND LICENCE
+
+-Copyright 2003 by Salvador Fandi�++Copyright 2003 by Salvador Fandiño.
+
+ Portions of this module have been copied from the Authen::SASL
+ package by Graham Barr.
diff --git a/perl-Authen-DigestMD5.spec b/perl-Authen-DigestMD5.spec
index 0f6404e..70fe278 100644
--- a/perl-Authen-DigestMD5.spec
+++ b/perl-Authen-DigestMD5.spec
@@ -1,15 +1,19 @@
Summary: SASL DIGEST-MD5 authentication (RFC2831)
Name: perl-Authen-DigestMD5
Version: 0.04
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Url: http://search.cpan.org/dist/Authen-DigestMD5/
Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Authen-DigestMD5-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: Authen-DigestMD5-0.04-UTF8.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
-BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl(Carp)
+BuildRequires: perl(Digest::MD5)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(Test::More)
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%description
This module supports DIGEST-MD5 SASL authentication as defined in RFC-2831.
@@ -18,32 +22,31 @@ This module supports DIGEST-MD5 SASL authentication as defined in RFC-2831.
%setup -q -n Authen-DigestMD5-%{version}
# Fix wrong script interpreter, and set permissions to avoid extra deps
-%{__sed} -i -e 's,/usr/local/bin/perl,%{__perl},' digest-md5-auth.pl
-%{__chmod} 644 digest-md5-auth.pl
+sed -i -e 's,/usr/local/bin/perl,%{__perl},' digest-md5-auth.pl
+chmod -c 644 digest-md5-auth.pl
# Fix character encoding
-%{__mv} DigestMD5.pm DigestMD5.pm.not-utf8
-/usr/bin/iconv -f iso8859-1 -t utf8 -o DigestMD5.pm DigestMD5.pm.not-utf8
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
-
-%check
-%{__make} test
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
%install
-%{__rm} -rf %{buildroot}
-%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
-/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
-%{__chmod} -R u+w %{buildroot}
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
# Get rid of sample code that introduces additional dep on perl(OpenLDAP)
-%{__rm} -f %{buildroot}%{perl_vendorlib}/Authen/digest-md5-auth.pl
+rm -f %{buildroot}%{perl_vendorlib}/Authen/digest-md5-auth.pl
+
+%check
+make test
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
@@ -52,13 +55,18 @@ This module supports DIGEST-MD5 SASL authentication as defined in RFC-2831.
%{_mandir}/man3/Authen::DigestMD5.3pm*
%changelog
-* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 0.04-12
+* Tue Jan 10 2012 Paul Howarth <paul@xxxxxxxxxxxx> 0.04-13
+- Nobody else likes macros for commands
+- Use a patch rather than scripted iconv to fix character encoding
+- BR: perl(Carp) and perl(Digest::MD5)
+
+* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> 0.04-12
- Perl mass rebuild
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.04-11
+* Tue Feb 8 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> 0.04-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Wed Dec 15 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 0.04-10
+* Wed Dec 15 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> 0.04-10
- Rebuild to fix problems with vendorarch/lib (#661697)
* Thu Apr 29 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> 0.04-9
@@ -73,7 +81,7 @@ This module supports DIGEST-MD5 SASL authentication as defined in RFC-2831.
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> 0.04-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> 0.04-5
+* Thu Mar 6 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> 0.04-5
- Rebuild for new perl
* Fri Aug 10 2007 Paul Howarth <paul@xxxxxxxxxxxx> 0.04-4
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
