- updated to 1.23

- removed obsolete pl.po-update patch

Changed files:
    libidn-pl.po-update.patch -> 1.24
    libidn.spec -> 1.98

diff --git a/libidn-pl.po-update.patch b/libidn-pl.po-update.patch
deleted file mode 100644 (file)
index 69ce5d7..0000000
--- a/libidn-pl.po-update.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- libidn-1.22/po/pl.po.orig  2011-05-04 20:38:39.000000000 +0200
-+++ libidn-1.22/po/pl.po       2011-05-06 17:13:40.462516657 +0200
-@@ -1,14 +1,14 @@
- # Polish translation for libidn.
- # Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
- # This file is distributed under the same license as the libidn package.
--# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2008.
-+# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2011.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: libidn 1.9\n"
-+"Project-Id-Version: libidn 1.22\n"
- "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
- "POT-Creation-Date: 2011-05-04 20:38+0200\n"
--"PO-Revision-Date: 2008-07-02 22:10+0200\n"
-+"PO-Revision-Date: 2011-05-06 17:12+0200\n"
- "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
- "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
- "Language: pl\n"
-@@ -204,7 +204,6 @@
- "  -u, --idna-to-unicode    Konwersja z ACE zgodnie z IDNA\n"
- 
- #: src/idn.c:102
--#, fuzzy
- msgid ""
- "      --allow-unassigned   Toggle IDNA AllowUnassigned flag (default off)\n"
- "      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
-@@ -213,16 +212,13 @@
- "      --usestd3asciirules  W³±czenie flagi IDNA UseSTD3ASCIIRules\n"
- 
- #: src/idn.c:106
--#, fuzzy
- msgid ""
- "      --no-tld             Don't check string for TLD specific rules\n"
- "                             Only for --idna-to-ascii and --idna-to-unicode\n"
- msgstr ""
--"  -t, --tld                Sprawdzenie ³añcucha pod k±tem regu³ "
--"specyficznych\n"
-+"      --no-tld             Niesprawdzenie ³añcucha pod k±tem regu³ specyficznych\n"
- "                             dla TLD;\n"
--"                             tylko dla --idna-to-ascii and --idna-to-"
--"unicode\n"
-+"                             tylko dla --idna-to-ascii and --idna-to-unicode\n"
- 
- #: src/idn.c:110
- msgid ""
-@@ -252,9 +248,9 @@
- "      --quiet              Dzia³enie po cichu\n"
- 
- #: src/idn.c:175
--#, fuzzy, c-format
-+#, c-format
- msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
--msgstr "Mo¿na podaæ tylko jedno z -s, -e, -d, -a, -u lub -n."
-+msgstr "Mo¿na podaæ tylko jedno z -s, -e, -d, -a, -u lub -n"
- 
- #: src/idn.c:185
- #, c-format
-@@ -270,20 +266,20 @@
- "Nale¿y podaæ ka¿dy ³añcuch w osobnej linii, zakoñczony znakiem nowej linii.\n"
- 
- #: src/idn.c:205
--#, fuzzy, c-format
-+#, c-format
- msgid "input error"
--msgstr "B³±d wej¶cia"
-+msgstr "b³±d wej¶cia"
- 
- #: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
--#, fuzzy, c-format
-+#, c-format
- msgid "could not convert from %s to UTF-8"
--msgstr "Nie mo¿na przekonwertowaæ z %s na UTF-8."
-+msgstr "nie mo¿na przekonwertowaæ z %s na UTF-8"
- 
- #: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
- #: src/idn.c:554
--#, fuzzy, c-format
-+#, c-format
- msgid "could not convert from UTF-8 to UCS-4"
--msgstr "Nie mo¿na przekonwertowaæ z UTF-8 na UCS-4."
-+msgstr "nie mo¿na przekonwertowaæ z UTF-8 na UCS-4"
- 
- #: src/idn.c:240
- #, c-format
-@@ -291,9 +287,9 @@
- msgstr "stringprep_profile: %s"
- 
- #: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
--#, fuzzy, c-format
-+#, c-format
- msgid "could not convert from UTF-8 to %s"
--msgstr "Nie mo¿na przekonwertowaæ z UTF-8 na %s."
-+msgstr "nie mo¿na przekonwertowaæ z UTF-8 na %s"
- 
- #: src/idn.c:298
- #, c-format
-@@ -302,7 +298,7 @@
- 
- #: src/idn.c:320
- msgid "malloc"
--msgstr ""
-+msgstr "malloc"
- 
- #: src/idn.c:326
- #, c-format
-@@ -310,9 +306,9 @@
- msgstr "punycode_decode: %s"
- 
- #: src/idn.c:343 src/idn.c:367 src/idn.c:445
--#, fuzzy, c-format
-+#, c-format
- msgid "could not convert from UCS-4 to UTF-8"
--msgstr "Nie mo¿na przekonwertowaæ z UCS-4 na UTF-8."
-+msgstr "nie mo¿na przekonwertowaæ z UCS-4 na UTF-8"
- 
- #: src/idn.c:384
- #, c-format
-@@ -340,15 +336,6 @@
- msgstr "idna_to_unicode_8z4z: %s"
- 
- #: src/idn.c:543
--#, fuzzy, c-format
-+#, c-format
- msgid "could not do NFKC normalization"
--msgstr "Normalizacja NFKC nie powiod³a siê."
--
--#~ msgid ""
--#~ "\n"
--#~ "Report bugs to <%s>.\n"
--#~ msgstr ""
--#~ "\n"
--#~ "Prosimy zg³aszaæ b³êdy na adres <%s>.\n"
--#~ "B³êdy w t³umaczeniu prosimy zg³aszaæ na adres <translation-team-pl@lists."
--#~ "sourceforge.net>.\n"
-+msgstr "normalizacja NFKC nie powiod³a siê"

diff --git a/libidn.spec b/libidn.spec
index e851a20af8bbe8dec7a0d35dec5a967c867dce35..d4b3db584de3293272583331b84e28570f72a998 100644 (file)
--- a/libidn.spec
+++ b/libidn.spec
@@ -20,21 +20,21 @@
 Summary:       Internationalized string processing library
 Summary(pl.UTF-8):     Biblioteka do przetwarzania umiędzynarodowionych łańcuchów
 Name:          libidn
-Version:       1.22
+Version:       1.23
 Release:       1
 License:       LGPL v2.1+ (library), GPL v3+ (utilities)
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
-# Source0-md5: 893a1df0cf3b28b72d248382eaeaca71
+# Source0-md5: f9a417270cc9b6bf763ae1f88e60191c
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-python.patch
-Patch2:                %{name}-pl.po-update.patch
 URL:           http://www.gnu.org/software/libidn/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
 %{?with_java:BuildRequires:    gcc-java}
 BuildRequires: gettext-devel >= 0.18.1
 %{?with_java:BuildRequires:    gjdoc}
+BuildRequires: gtk-doc >= 1.1
 BuildRequires: help2man
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libtool >= 2:1.5
@@ -149,13 +149,12 @@ domen).
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 # avoid different builds having different timestamps
 # see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2008-August/020363.html
-d='$Date: 2011-09-21 08:16:34 $'
+d='$Date: 2011-11-28 18:04:48 $'
 d=${d#?Date: }; d=${d%%%% *}; d=$(date -d "$d" '+%d %B %Y')
 %{__sed} -i -e "s,@value{UPDATED},$d,g" doc/libidn.texi
 
@@ -168,6 +167,7 @@ d=${d#?Date: }; d=${d%%%% *}; d=$(date -d "$d" '+%d %B %Y')
 %{__automake}
 JAR=%{_bindir}/fastjar \
 %configure \
+       --disable-silent-rules \
        %{?with_dotnet:--enable-csharp=mono}%{!?with_dotnet:--disable-csharp} \
        %{?with_java:--enable-java} \
        --with-lispdir=%{_emacs_lispdir}