Use a patch rather than a scripted iconv to fix the character encoding

This commit is contained in:
Paul Howarth 2011-07-14 09:05:48 +01:00
parent e042be344b
commit 74f72ac5d7
2 changed files with 33 additions and 4 deletions

View File

@ -0,0 +1,26 @@
--- Net-SSLeay-1.36/Credits
+++ Net-SSLeay-1.36/Credits
@@ -3,6 +3,6 @@ Clinton Wong <clintdw@netcom.com>
Jim Bowlin <jbowlin@linklint.org> for contributing Net::SSLeay::Handle
Eric A Selber <eselber@briefcase.com> for Windows fixes and testing
Marko Asplund <aspa@kronodoc.fi> for many suggestions and fixes
-Sébastien Aperghis-Tramoni <saper@cpan.org> for many fixes and cleanups
+Sébastien Aperghis-Tramoni <saper@cpan.org> 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äki <sampo@symlabs.com>
+Originally written by Sampo Kellomäki <sampo@symlabs.com>
=head1 COPYRIGHT
-Copyright (c) 1996-2003 Sampo Kellomäki <sampo@symlabs.com>
+Copyright (c) 1996-2003 Sampo Kellomäki <sampo@symlabs.com>
Copyright (C) 2005-2006 Florian Ragwitz <rafl@debian.org>

View File

@ -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@city-fan.org> - 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@gmail.com> - 1.36-5