rpms/perl-Unicode-String/EL-5 perl-Unicode-String-2.09-utf8doc.patch, NONE, 1.1 perl-Unicode-String.spec, 1.10, 1.11

Paul Howarth pghmcfc at fedoraproject.org
Thu Feb 18 10:48:32 UTC 2010


Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Unicode-String/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20747/EL-5

Modified Files:
	perl-Unicode-String.spec 
Added Files:
	perl-Unicode-String-2.09-utf8doc.patch 
Log Message:
- license is same as perl
- carefully convert documentation to UTF-8 encoding
- add :MODULE_COMPAT_* dependency


perl-Unicode-String-2.09-utf8doc.patch:
 README    |    8 ++++----
 String.pm |   18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE perl-Unicode-String-2.09-utf8doc.patch ---
--- Unicode-String-2.09/README		2005-10-25 13:56:28.000000000 +0100
+++ Unicode-String-2.09/README.utf8	2010-02-18 09:11:45.235669975 +0000
@@ -18,8 +18,8 @@
    o Depreciation because of perl's own utf8 support.
 
    o Composition/decomposition support:
-     $u->decomp;  # will decomposite as much as possible:  "å"  --> "a°"
-     $u->comp;    # will composite as much as possible:    "a°" --> "å"
+     $u->decomp;  # will decomposite as much as possible:  "å"  --> "a°"
+     $u->comp;    # will composite as much as possible:    "a°" --> "å"
 
      Need separate routines or a special argument to distinguish
      between compatibility decomposition and canonical decomposition.
@@ -64,7 +64,7 @@
    print $u->latin1;
    print $u->hex;
 
-   print latin1("naïve\n")->utf8;
+   print utf8("naïve\n")->latin1;
 
    use Unicode::CharName qw(uname);
    print uname(ord('$')), "\n";
@@ -73,7 +73,7 @@
 
 COPYRIGHT
 
-  © 1997-2000,2005 Gisle Aas. All rights reserved.
+  © 1997-2000,2005 Gisle Aas. All rights reserved.
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
--- Unicode-String-2.09/String.pm	2005-10-26 09:13:10.000000000 +0100
+++ Unicode-String-2.09/String.pm.utf8	2010-02-18 09:11:45.234427359 +0000
@@ -597,7 +597,7 @@
 current value is returned.
 
 To illustrate the encodings we show how the 2 character sample string
-of "µm" (micro meter) is encoded for each one.
+of "µm" (micro meter) is encoded for each one.
 
 =over 4
 
@@ -606,7 +606,7 @@
 =item $us->utf32be( $newval )
 
 The string passed should be in the UTF-32 encoding with bytes in big
-endian order.  The sample "µm" is "\0\0\0\xB5\0\0\0m" in this encoding.
+endian order.  The sample "µm" is "\0\0\0\xB5\0\0\0m" in this encoding.
 
 Alternative names for this method are utf32() and ucs4().
 
@@ -615,14 +615,14 @@
 =item $us->utf32le( $newval )
 
 The string passed should be in the UTF-32 encoding with bytes in little
-endian order.  The sample "µm" is is "\xB5\0\0\0m\0\0\0" in this encoding.
+endian order.  The sample "µm" is is "\xB5\0\0\0m\0\0\0" in this encoding.
 
 =item $us->utf16be
 
 =item $us->utf16be( $newval )
 
 The string passed should be in the UTF-16 encoding with bytes in big
-endian order. The sample "µm" is "\0\xB5\0m" in this encoding.
+endian order. The sample "µm" is "\0\xB5\0m" in this encoding.
 
 Alternative names for this method are utf16() and ucs2().
 
@@ -635,7 +635,7 @@
 =item $us->utf16le( $newval )
 
 The string passed should be in the UTF-16 encoding with bytes in
-little endian order.  The sample "µm" is is "\xB5\0m\0" in this
+little endian order.  The sample "µm" is is "\xB5\0m\0" in this
 encoding.  This is the encoding used by the Microsoft Windows API.
 
 If the string passed to utf16le() starts with the Unicode byte order
@@ -646,14 +646,14 @@
 
 =item $us->utf8( $newval )
 
-The string passed should be in the UTF-8 encoding. The sample "µm" is
+The string passed should be in the UTF-8 encoding. The sample "µm" is
 "\xC2\xB5m" in this encoding.
 
 =item $us->utf7
 
 =item $us->utf7( $newval )
 
-The string passed should be in the UTF-7 encoding. The sample "µm" is
+The string passed should be in the UTF-7 encoding. The sample "µm" is
 "+ALU-m" in this encoding.
 
 
@@ -673,7 +673,7 @@
 
 =item $us->latin1( $newval )
 
-The string passed should be in the ISO-8859-1 encoding. The sample "µm" is
+The string passed should be in the ISO-8859-1 encoding. The sample "µm" is
 "\xB5m" in this encoding.
 
 Characters outside the "\x00" .. "\xFF" range are simply removed from
@@ -688,7 +688,7 @@
 The string passed should be plain ASCII where each Unicode character
 is represented by the "U+XXXX" string and separated by a single space
 character.  The "U+" prefix is optional when setting the value.  The
-sample "µm" is "U+00b5 U+006d" in this encoding.
+sample "µm" is "U+00b5 U+006d" in this encoding.
 
 =back
 


Index: perl-Unicode-String.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-String/EL-5/perl-Unicode-String.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Unicode-String.spec	6 Dec 2007 12:33:22 -0000	1.10
+++ perl-Unicode-String.spec	18 Feb 2010 10:48:32 -0000	1.11
@@ -1,17 +1,16 @@
 Name:           perl-Unicode-String
 Version:        2.09
-Release:        6%{?dist}
-
+Release:        7%{?dist}
 Summary:        Perl modules to handle various Unicode issues
-
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-String/
-Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-String-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-%{version}.tar.gz
+Patch0:         perl-Unicode-String-2.09-utf8doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       perl(MIME::Base64) >= 2.00
 BuildRequires:  perl(MIME::Base64) >= 2.00, perl(ExtUtils::MakeMaker)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(MIME::Base64) >= 2.00
 
 %description
 These are experimental modules to handle various Unicode issues.  They
@@ -21,10 +20,10 @@ were made before perl included native UT
 %prep
 %setup -q -n Unicode-String-%{version}
 
-for f in README String.pm; do
-  iconv -f iso-8859-15 -t utf8 < ${f} > ${f}.utf8
-  mv ${f}.utf8 ${f}
-done
+# Recode documentation as UTF-8
+# Can't just use iconv because README includes an example of
+# character code conversion that would be wrong if simply recoded
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -36,8 +35,8 @@ 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 -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} ';' 2>/dev/null
+chmod -R u+w $RPM_BUILD_ROOT
 
 
 %check
@@ -58,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 18 2010 Paul Howarth <paul at city-fan.org> 2.09-7
+- license is same as perl
+- carefully convert documentation to UTF-8 encoding
+- add :MODULE_COMPAT_* dependency
+
 * Thu Dec  6 2007 Paul Howarth <paul at city-fan.org> 2.09-6
 - simplify package build in line with perl spec template
 - more detailed package description




More information about the perl-devel mailing list