- added fixes from Fedora

- rel 14

diff --git a/perl-Unicode-String.spec b/perl-Unicode-String.spec
index edc8b4eeedd642f39bbe3b296e35733c781d2bd7..d8468faf81d61c3088fad3a7f9e3ab90d2984c99 100644 (file)
--- a/perl-Unicode-String.spec
+++ b/perl-Unicode-String.spec
@@ -9,12 +9,14 @@ Summary:      Unicode::String perl module
 Summary(pl.UTF-8):     Moduł perla Unicode::String
 Name:          perl-Unicode-String
 Version:       2.09
-Release:       13
+Release:       14
 # same as perl
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/Unicode/%{pdir}-%{pnam}-%{version}.tar.gz
 # Source0-md5: 553e68e603723bf7c631f8701ab0d678
+Patch0:                undefined.patch
+Patch1:                utf8doc.patch
 URL:           http://search.cpan.org/dist/Unicode-String/
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: perl-MIME-Base64 >= 2.00
@@ -31,6 +33,8 @@ Moduł Perla Unicode::String - klasa ciągu unikodowych znaków
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__perl} Makefile.PL \

diff --git a/undefined.patch b/undefined.patch
new file mode 100644 (file)
index 0000000..184b447
--- /dev/null
+++ b/undefined.patch
@@ -0,0 +1,12 @@
+diff -ru libunicode-string-perl-2.09.pristine/lib/Unicode/CharName.pm libunicode-string-perl-2.09/lib/Unicode/CharName.pm
+--- libunicode-string-perl-2.09.pristine/lib/Unicode/CharName.pm       2005-10-25 19:11:00.000000000 +0100
++++ libunicode-string-perl-2.09/lib/Unicode/CharName.pm        2012-01-24 12:56:59.730653088 +0000
+@@ -77,7 +77,7 @@
+           return join("", "HANGUL SYLLABLE ", @s)
+       }
+     }
+-    _init_names() unless defined %NAMES;
++    _init_names() unless %NAMES;
+     $NAMES{sprintf("%04X",$code)}
+ }
+ 

diff --git a/utf8doc.patch b/utf8doc.patch
new file mode 100644 (file)
index 0000000..10a2ebc
--- /dev/null
+++ b/utf8doc.patch
@@ -0,0 +1,112 @@
+--- 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
+