- updated to 0.16

- updated info patch

diff --git a/libidn2-info.patch b/libidn2-info.patch
index 81095ef22a5662852db74b53d4561ebb06d9d03d..93797853f89886888f6d0ae5c07a822bfbecce4b 100644 (file)
--- a/libidn2-info.patch
+++ b/libidn2-info.patch
@@ -1,21 +1,21 @@
---- libidn2-0.4/doc/libidn2.texi.orig  2011-05-05 17:16:53.000000000 +0200
-+++ libidn2-0.4/doc/libidn2.texi       2011-05-17 19:46:41.224646947 +0200
+--- libidn2-0.16/doc/libidn2.texi.orig 2017-01-14 16:00:15.000000000 +0100
++++ libidn2-0.16/doc/libidn2.texi      2017-02-08 21:23:02.087171715 +0100
 @@ -15,14 +15,14 @@
- Copyright @copyright{} 2011 Simon Josefsson
+ Copyright @copyright{} 2011-2017 Simon Josefsson
  @end copying
  
 -@dircategory Software libraries
 +@dircategory Libraries:
  @direntry
--* libidn2: (libidn2). Internationalized domain names (IDNA2008) processing.
-+* libidn2: (libidn2).                 Internationalized domain names (IDNA2008) processing
+-* libidn2: (libidn2). Internationalized domain names (IDNA2008/TR46) processing.
++* libidn2: (libidn2).                 Internationalized domain names (IDNA2008/TR46) processing
  @end direntry
  
 -@dircategory Localization
 +@dircategory Miscellaneous:
  @direntry
--* idn2: (libidn2)Invoking idn2.       Internationalized Domain Name (IDNA2008) conversion.
-+* idn2: (libidn2)idn2.                        Internationalized Domain Name (IDNA2008) conversion
+-* idn2: (libidn2)Invoking idn2.       Internationalized Domain Name (IDNA2008/TR46) conversion.
++* idn2: (libidn2)idn2.                        Internationalized Domain Name (IDNA2008/TR46) conversion
  @end direntry
  
  @titlepage
@@ -28,7 +28,7 @@
  
  * Interface Index::
  * Concept Index::
-@@ -265,7 +265,7 @@
+@@ -308,7 +308,7 @@
  
  @verbatiminclude register.c
  

diff --git a/libidn2.spec b/libidn2.spec
index 41851f1b84235209ddb5fba5ea3b7c6b45cf65e6..827fc20d1c02d38afc8845cdc60b5026559b5de3 100644 (file)
--- a/libidn2.spec
+++ b/libidn2.spec
@@ -1,16 +1,17 @@
 Summary:       Free software implementation of IDNA2008
 Summary(pl.UTF-8):     Wolnodostępna implementacja IDNA2008
 Name:          libidn2
-Version:       0.10
-Release:       2
+Version:       0.16
+Release:       1
 License:       LGPL v3+ or GPL v2+ (library), GPL v3+ (utilities)
 Group:         Libraries
 Source0:       http://alpha.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
-# Source0-md5: 07560c7d6f747e0cef1207bc376ae266
+# Source0-md5: bc4c2f777016011b613affbd55e2ff83
 Patch0:                %{name}-info.patch
 URL:           http://www.gnu.org/software/libidn/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
+BuildRequires: gettext-tools >= 0.19.3
 BuildRequires: gtk-doc >= 1.1
 BuildRequires: help2man
 BuildRequires: libtool >= 2:2.0
@@ -58,17 +59,12 @@ Statyczna biblioteka libidn2.
 %patch0 -p1
 
 %build
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4 -I gl/m4
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd src
-%{__aclocal} -I ../m4 -I gl/m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
 %configure \
        --with-html-dir=%{_gtkdocdir}
 
@@ -80,11 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# too common names
-for f in lookup register ; do
-       mv -f $RPM_BUILD_ROOT%{_bindir}/$f $RPM_BUILD_ROOT%{_bindir}/idn2-${f}
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -98,10 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/idn2
-%attr(755,root,root) %{_bindir}/idn2-lookup
-%attr(755,root,root) %{_bindir}/idn2-register
 %attr(755,root,root) %{_libdir}/libidn2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libidn2.so.0
 %{_mandir}/man1/idn2.1*