commit 74f72ac5d776d90703f1be277d49e7eff49d1462
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Jul 14 09:05:48 2011 +0100
Use a patch rather than a scripted iconv to fix the character encoding
Net-SSLeay-1.36-UTF8.patch | 26 ++++++++++++++++++++++++++
perl-Net-SSLeay.spec | 11 +++++++----
2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/Net-SSLeay-1.36-UTF8.patch b/Net-SSLeay-1.36-UTF8.patch
new file mode 100644
index 0000000..2051e4c
--- /dev/null
+++ b/Net-SSLeay-1.36-UTF8.patch
@@ -0,0 +1,26 @@
+--- Net-SSLeay-1.36/Credits
++++ Net-SSLeay-1.36/Credits
+@@ -3,6 +3,6 @@ Clinton Wong <clintdw@xxxxxxxxxx>
+ Jim Bowlin <jbowlin@xxxxxxxxxxxx> for contributing Net::SSLeay::Handle
+ Eric A Selber <eselber@xxxxxxxxxxxxx> for Windows fixes and testing
+ Marko Asplund <aspa@xxxxxxxxxxx> for many suggestions and fixes
+-S�stien Aperghis-Tramoni <saper@xxxxxxxx> for many fixes and cleanups
++Sébastien Aperghis-Tramoni <saper@xxxxxxxx> for many fixes and cleanups
+
+ See Changes file for other contributions.
+--- Net-SSLeay-1.36/lib/Net/SSLeay.pm
++++ Net-SSLeay-1.36/lib/Net/SSLeay.pm
+@@ -1710,11 +1710,11 @@ Commercial support for Net::SSLeay may b
+
+ Maintained by Mike McCauley and Florian Ragwitz since November 2005
+
+-Originally written by Sampo Kellom� <sampo@xxxxxxxxxxx>
++Originally written by Sampo Kellomäki <sampo@xxxxxxxxxxx>
+
+ =head1 COPYRIGHT
+
+-Copyright (c) 1996-2003 Sampo Kellom� <sampo@xxxxxxxxxxx>
++Copyright (c) 1996-2003 Sampo Kellomäki <sampo@xxxxxxxxxxx>
+
+ Copyright (C) 2005-2006 Florian Ragwitz <rafl@xxxxxxxxxx>
+
diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index 9504c02..31cb3a2 100644
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -6,6 +6,7 @@ Group: Development/Libraries
License: OpenSSL
URL: http://search.cpan.org/dist/Net-SSLeay/
Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz
+Patch0: Net-SSLeay-1.36-UTF8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker), openssl-devel
@@ -29,12 +30,13 @@ so you can write servers or clients for more complicated applications.
%prep
%setup -q -n Net-SSLeay-%{version}
+# Re-code docs as UTF-8
+%patch0 -p1
+
+# Fix permissions and shellbangs in examples
+# to avoid bogus doc-file dependencies
chmod -c 644 examples/*
perl -pi -e 's|/usr/local/bin/perl|/usr/bin/perl|' examples/*.pl
-for f in Credits lib/Net/SSLeay.pm; do
- iconv -f iso-8859-1 -t utf-8 ${f} > ${f}.utf8
- mv ${f}.utf8 ${f}
-done
%build
PERL_MM_USE_DEFAULT=1 perl Makefile.PL \
@@ -68,6 +70,7 @@ rm -rf %{buildroot}
%changelog
* Thu Jul 14 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 1.36-6
+- use a patch rather than a scripted iconv to fix the character encoding
- nobody else likes macros for commands
* Wed Jul 13 2011 Iain Arnell <iarnell@xxxxxxxxx> - 1.36-5
--
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
