X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libidn.spec;h=60d7b8c4e9cc2c90534293f1e847d1f6e457a617;hb=add7d1f9e35926fec041161246164cefdc8db3ab;hp=40d24979f49b3032751ce199e382799ee6cdd76a;hpb=408fee0a8c85d514bab24ea2b4936eee3718a1a5;p=packages%2Flibidn.git

diff --git a/libidn.spec b/libidn.spec
index 40d2497..60d7b8c 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,40 +1,50 @@
 # 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} arm hppa ppc s390 s390x
+%ifnarch %{ix86} %{x8664} alpha %{arm} hppa ppc s390 s390x sparc sparcv9 sparc64
 %undefine	with_dotnet
 %endif
 %ifarch i386
 %undefine	with_dotnet
 %endif
 Summary:	Internationalized string processing library
-Summary(pl):	Biblioteka do przetwarzania umiêdzynarodowionych ³añcuchów
+Summary(pl.UTF-8):	Biblioteka do przetwarzania umiędzynarodowionych łańcuchów
 Name:		libidn
-Version:	0.6.8
+Version:	1.35
 Release:	1
-License:	LGPL v2.1
+License:	GPL v2+ or LGPL v3+ (library), GPL v3+ (utilities)
 Group:		Libraries
-Source0:	http://josefsson.org/libidn/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	5d1a2e42f91c1d53376ec37557601d47
+Source0:	http://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
+# 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.60
-BuildRequires:	automake >= 1:1.9
-%{?with_java:BuildRequires:	gcc-java}
-BuildRequires:	gettext-devel >= 0.14.1
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.10
+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
 Requires(post,postun):	/sbin/ldconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,62 +57,67 @@ GNU Libidn is an implementation of the Stringprep, Punycode and IDNA
 specifications defined by the IETF Internationalized Domain Names
 (IDN) working group, used for internationalized domain names.
 
-%description -l pl
+%description -l pl.UTF-8
 GNU Libidn to implementacja specyfikacji Stringprep, Punycode i IDNA
-zdefiniowanych przez grupê robocz± IETF Internationalized Domain Names
-(IDN), zajmuj±c± siê umiêdzynarodowionymi nazwami domen.
+zdefiniowanych przez grupę roboczą IETF Internationalized Domain Names
+(IDN), zajmującą się umiędzynarodowionymi nazwami domen.
 
 %package devel
 Summary:	Header files for libidn library
-Summary(pl):	Pliki nag³ówkowe biblioteki libidn
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libidn
+License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Header files for libidn library.
 
-%description devel -l pl
-Pliki nag³ówkowe biblioteki libidn.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libidn.
 
 %package static
 Summary:	Static libidn library
-Summary(pl):	Statyczna biblioteka libidn
+Summary(pl.UTF-8):	Statyczna biblioteka libidn
+License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static libidn library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna biblioteka libidn.
 
 %package -n dotnet-libidn
 Summary:	C# binding for libidn
-Summary(pl):	Wi±zanie C# dla libidn
+Summary(pl.UTF-8):	Wiązanie C# dla libidn
+License:	LGPL v2.1+
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description -n dotnet-libidn
 C# binding for libidn.
 
-%description -n dotnet-libidn -l pl
-Wi±zanie C# dla libidn.
+%description -n dotnet-libidn -l pl.UTF-8
+Wiązanie C# dla libidn.
 
 %package -n emacs-libidn-pkg
 Summary:	IDN support files for emacs
-Summary(pl):	Obs³uga IDN dla emacsa
+Summary(pl.UTF-8):	Obsługa IDN dla emacsa
+License:	GPL v3+
 Group:		Applications/Editors/Emacs
 Requires:	%{name} = %{version}-%{release}
 
 %description -n emacs-libidn-pkg
 IDN support files for emacs.
 
-%description -n emacs-libidn-pkg -l pl
-Obs³uga IDN dla emacsa.
+%description -n emacs-libidn-pkg -l pl.UTF-8
+Obsługa IDN dla emacsa.
 
 %package -n java-libidn
 Summary:	Java implementation of libidn
-Summary(pl):	Implementacja libidn w Javie
+Summary(pl.UTF-8):	Implementacja libidn w Javie
+License:	LGPL v2.1+
 Group:		Libraries
 Requires:	jre
 
@@ -110,13 +125,14 @@ Requires:	jre
 Java implementation of libidn (internationalized domain names
 library).
 
-%description -n java-libidn -l pl
-Implementacja libidn (biblioteki umiêdzynarodowionych nazw domen) w
+%description -n java-libidn -l pl.UTF-8
+Implementacja libidn (biblioteki umiędzynarodowionych nazw domen) w
 Javie.
 
 %package -n python-idn
 Summary:	Python interface to libidn
-Summary(pl):	Pythonowy interfejs do libidn
+Summary(pl.UTF-8):	Pythonowy interfejs do libidn
+License:	LGPL v2.1+
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
 %pyrequires_eq	python-libs
@@ -124,27 +140,36 @@ Requires:	%{name} = %{version}-%{release}
 %description -n python-idn
 Python interface to libidn (internationalized domain names library).
 
-%description -n python-idn -l pl
-Pythonowy interfejs do libidn (biblioteki umiêdzynarodowionych nazw
+%description -n python-idn -l pl.UTF-8
+Pythonowy interfejs do libidn (biblioteki umiędzynarodowionych nazw
 domen).
 
 %prep
 %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: 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}
-%{__aclocal} -I m4 -I gl/m4
+%{__aclocal} -I m4 -I gl/m4 -I lib/gl/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}
@@ -154,6 +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
 %endif
 
 %install
@@ -163,7 +189,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}
@@ -183,19 +209,31 @@ 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.12
 %{_mandir}/man1/idn.1*
 %{_infodir}/libidn.info*
+%{_infodir}/libidn-*.png
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libidn.so
 %{_libdir}/libidn.la
-%{_includedir}/*.h
+%{_includedir}/idn-*.h
+%{_includedir}/idna.h
+%{_includedir}/pr29.h
+%{_includedir}/punycode.h
+%{_includedir}/stringprep.h
+%{_includedir}/tld.h
 %{_pkgconfigdir}/libidn.pc
-%{_mandir}/man3/*
+%{_mandir}/man3/idn_*.3*
+%{_mandir}/man3/idna_*.3*
+%{_mandir}/man3/pr29_*.3*
+%{_mandir}/man3/punycode_*.3*
+%{_mandir}/man3/stringprep*.3*
+%{_mandir}/man3/tld_*.3*
 
 %files static
 %defattr(644,root,root,755)
@@ -215,7 +253,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}