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

diff --git a/libidn.spec b/libidn.spec
index 26a2412..09ccc0e 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,5 +1,5 @@
 # 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"
@@ -11,7 +11,7 @@
 %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,18 +20,17 @@
 Summary:	Internationalized string processing library
 Summary(pl.UTF-8):	Biblioteka do przetwarzania umiędzynarodowionych łańcuchów
 Name:		libidn
-Version:	1.32
-Release:	1
+Version:	1.36
+Release:	2
 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:	4dd8356ba577287ea7076bfa1554b534
+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-tools >= 0.19.3
 %{?with_java:BuildRequires:	gjdoc}
 BuildRequires:	gtk-doc >= 1.1
@@ -162,6 +161,9 @@ d=${d#?Date: }; d=${d%%%% *}; d=$(date -d "$d" '+%d %B %Y')
 # (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}
 %{__libtoolize}
@@ -169,7 +171,6 @@ 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} \
@@ -181,7 +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
+%{__mv} contrib/idn-python/idn.so python-idn.so
 %endif
 
 %install
@@ -211,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