rpms/perl-Unicode-String/devel perl-Unicode-String-2.09-utf8doc.patch, NONE, 1.1 perl-Unicode-String.spec, 1.20, 1.21

Paul Howarth pghmcfc at fedoraproject.org
Thu Feb 18 10:13:01 UTC 2010


Author: pghmcfc

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

Modified Files:
	perl-Unicode-String.spec 
Added Files:
	perl-Unicode-String-2.09-utf8doc.patch 
Log Message:
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/devel/perl-Unicode-String.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Unicode-String.spec	17 Feb 2010 08:12:14 -0000	1.20
+++ perl-Unicode-String.spec	18 Feb 2010 10:13:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-Unicode-String
 Version:        2.09
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Perl modules to handle various Unicode issues
 
@@ -11,10 +11,11 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-String/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-String-2.09.tar.gz
+Patch0:         perl-Unicode-String-2.09-utf8doc.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(MIME::Base64)
-BuildRequires:  %{_bindir}/iconv
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # not detected by auto provide scripts:
 Requires:       perl(MIME::Base64)
 
@@ -24,8 +25,11 @@ Requires:       perl(MIME::Base64)
 
 %prep
 %setup -q -n Unicode-String-%{version}
-iconv -f ISO_8859-1 -t UTF-8 -o README.new README &&
-mv README.new README
+
+# 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
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -60,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 18 2010 Paul Howarth <paul at city-fan.org> - 2.09-14
+- carefully convert documentation to UTF-8 encoding
+- add :MODULE_COMPAT_* dependency
+
 * Wed Feb 17 2010 Marcela Mašláňová <mmaslano at redhat.com> - 2.09-13
 - fix license
 



More information about the scm-commits mailing list