- updated to 1.35 (note: new soname)

[packages/libidn.git] / libidn.spec

diff --git a/libidn.spec b/libidn.spec
index d8bf0c31b09bb9f82ea1e5d83b3e716ae8147197..60d7b8c4e9cc2c90534293f1e847d1f6e457a617 100644 (file)
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,17 +1,17 @@
 # TODO:
-# - prepare package with web-files and java from contrib
+# - prepare package with web-files from contrib and JNI (contrib/java, needs move to jdk)
 #
 # Conditional build:
 %if "%{pld_release}" == "ac"
-%bcond_with            dotnet  # don't build C# binding
-%bcond_with            java    # don't build Java implementation
+%bcond_with    dotnet  # don't build C# binding
+%bcond_with    java    # don't build Java implementation
 %else
 %bcond_without dotnet  # don't build C# binding
 %bcond_without java    # don't build Java implementation
 %endif
 %bcond_without python  # don't build python interface
 #
-%ifnarch %{ix86} %{x8664} alpha arm hppa ppc s390 s390x sparc sparcv9 sparc64
+%ifnarch %{ix86} %{x8664} alpha %{arm} hppa ppc s390 s390x sparc sparcv9 sparc64
 %undefine      with_dotnet
 %endif
 %ifarch i386
@@ -20,25 +20,25 @@
 Summary:       Internationalized string processing library
 Summary(pl.UTF-8):     Biblioteka do przetwarzania umiędzynarodowionych łańcuchów
 Name:          libidn
-Version:       1.21
+Version:       1.35
 Release:       1
-License:       LGPL v2.1+ (library), GPL v3+ (utilities)
+License:       GPL v2+ or LGPL v3+ (library), GPL v3+ (utilities)
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
-# Source0-md5: 80aba4e9503cd3ba6725cdbf265550f8
+# Source0-md5: bef634141fe39326cb354b75e891fead
 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
+BuildRequires: gettext-tools >= 0.19.3
 %{?with_java:BuildRequires:    gjdoc}
+BuildRequires: gtk-doc >= 1.1
 BuildRequires: help2man
 %{?with_java:BuildRequires:    jdk}
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2
 %{?with_dotnet:BuildRequires:  mono}
+%{?with_dotnet:BuildRequires:  mono-csharp}
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 %{?with_python:BuildRequires:  python-devel >= 1:2.3}
@@ -148,16 +148,19 @@ 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-04-26 16:05:03 $'
+d='$Date: 2012-05-24 11:40:06 $'
 d=${d#?Date: }; d=${d%%%% *}; d=$(date -d "$d" '+%d %B %Y')
 %{__sed} -i -e "s,@value{UPDATED},$d,g" doc/libidn.texi
 
+# remove it when "linking libtool libraries using a non-POSIX archiver ..." warning is gone
+# (after libidn or libtool change)
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
+
 %build
 %{__gettextize}
 %{__libtoolize}
@@ -165,8 +168,8 @@ d=${d#?Date: }; d=${d%%%% *}; d=$(date -d "$d" '+%d %B %Y')
 %{__autoconf}
 %{__autoheader}
 %{__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}
@@ -176,7 +179,7 @@ JAR=%{_bindir}/fastjar \
 %if %{with python}
 %{__make} -C contrib/idn-python \
        INCLUDE="%{py_incdir} %{rpmcflags} -I../../lib -L../../lib/.libs"
-mv contrib/idn-python/idn.so python-idn.so
+%{__mv} contrib/idn-python/idn.so python-idn.so
 %endif
 
 %install
@@ -206,10 +209,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQ NEWS README* THANKS TODO doc/libidn.html contrib
+%doc AUTHORS ChangeLog FAQ NEWS README* THANKS TODO doc/libidn.html contrib/web
 %attr(755,root,root) %{_bindir}/idn
 %attr(755,root,root) %{_libdir}/libidn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libidn.so.11
+%attr(755,root,root) %ghost %{_libdir}/libidn.so.12
 %{_mandir}/man1/idn.1*
 %{_infodir}/libidn.info*
 %{_infodir}/libidn-*.png