X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libidn.spec;h=09ccc0eede8302faf5a30d4990671dd5ee9d86df;hb=e556e33;hp=6bf2fe6c8f69f7835d56ee190016169afaa0681e;hpb=fe07bd32a59ef83e36d1cbb2932cbb189f402f6c;p=packages%2Flibidn.git

diff --git a/libidn.spec b/libidn.spec
index 6bf2fe6..09ccc0e 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,12 +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
+%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
@@ -15,24 +20,29 @@
 Summary:	Internationalized string processing library
 Summary(pl.UTF-8):	Biblioteka do przetwarzania umiędzynarodowionych łańcuchów
 Name:		libidn
-Version:	1.5
-Release:	1
-License:	LGPL v2.1+ (library), GPL v3+ (utilities)
+Version:	1.36
+Release:	2
+License:	GPL v2+ or LGPL v3+ (library), GPL v3+ (utilities)
 Group:		Libraries
-Source0:	http://josefsson.org/libidn/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	5d95424a76fb7356f54e7fba83eb3379
+Source0:	https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
+# Source0-md5:	813c7b268d1051ca02c3610986126f38
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-python.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.17
+BuildRequires:	gettext-tools >= 0.19.3
 %{?with_java:BuildRequires:	gjdoc}
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	gtk-doc >= 1.1
+BuildRequires:	help2man
+%{?with_java:BuildRequires:	jdk}
+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}
+BuildRequires:	rpm >= 4.4.9-56
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	rpmbuild(macros) >= 1.384
 BuildRequires:	texinfo >= 4.7
@@ -139,9 +149,20 @@ domen).
 %patch0 -p1
 %patch1 -p1
 
-rm -f po/stamp-po
-# we don't have libtool 2.1b
-rm m4/libtool.m4 m4/lt*.m4
+%{__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: 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
+
+# rebuild from sources
+%{__rm} java/libidn-%{version}.jar
 
 %build
 %{__gettextize}
@@ -150,8 +171,8 @@ rm m4/libtool.m4 m4/lt*.m4
 %{__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}
@@ -161,6 +182,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
 %endif
 
 %install
@@ -170,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with python}
-install -D contrib/idn-python/idn.so $RPM_BUILD_ROOT%{py_sitedir}/idn.so
+install -D python-idn.so $RPM_BUILD_ROOT%{py_sitedir}/idn.so
 %endif
 
 %find_lang %{name}
@@ -190,10 +212,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
@@ -209,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/stringprep.h
 %{_includedir}/tld.h
 %{_pkgconfigdir}/libidn.pc
+%{_mandir}/man3/idn_*.3*
 %{_mandir}/man3/idna_*.3*
 %{_mandir}/man3/pr29_*.3*
 %{_mandir}/man3/punycode_*.3*
@@ -233,7 +256,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files -n java-libidn
 %defattr(644,root,root,755)
-%{_datadir}/java/libidn*.jar
+%{_javadir}/libidn*.jar
 %endif
 
 %if %{with python}