X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libidn.spec;h=921bef80de663a43ad7d6cff368ab1b7da3af7b4;hb=0ce499f1a7686405c08381d4694b548fc39d029e;hp=e8f202a6408ef840468f3a53b2a4a1076b628fae;hpb=b3f5b9bbba1c0bee218bfcf6c7f248c1de27ac0e;p=packages%2Flibidn.git

diff --git a/libidn.spec b/libidn.spec
index e8f202a..921bef8 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -2,27 +2,39 @@
 # - prepare package with web-files and java from contrib
 #
 # Conditional build:
-%bcond_with	java	# build Java implementation
+%bcond_without	dotnet	# don't build C# binding
+%bcond_without	java	# don't build Java implementation
+%bcond_without	python	# don't build python interface
 #
+%ifnarch %{ix86} %{x8664} arm hppa ppc s390 s390x
+%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
 Name:		libidn
-Version:	0.5.2
+Version:	0.6.10
 Release:	1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://josefsson.org/libidn/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	fef54277d08cc74e7e99ff65e058e1b7
+# Source0-md5:	443c25385059eb72e4588112af72c0c0
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-python.patch
+Patch2:		%{name}-pl.po-update.patch
 URL:		http://www.gnu.org/software/libidn/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1.8
-BuildRequires:	gettext-devel >= 0.14.1
-%{?with_java:BuildRequires:	jdk}
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.10
+%{?with_java:BuildRequires:	gcc-java}
+BuildRequires:	gettext-devel >= 0.16
+%{?with_java:BuildRequires:	gjdoc}
 BuildRequires:	libtool >= 2:1.5
-Buildrequires:	perl-base
-BuildRequires:	python-devel
+%{?with_dotnet:BuildRequires:	mono}
+BuildRequires:	perl-base
+%{?with_python:BuildRequires:	python-devel >= 1:2.3}
+%{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	texinfo >= 4.7
 Requires(post,postun):	/sbin/ldconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,6 +76,18 @@ Static libidn library.
 %description static -l pl
 Statyczna biblioteka libidn.
 
+%package -n dotnet-libidn
+Summary:	C# binding for libidn
+Summary(pl):	Wi±zanie C# dla libidn
+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.
+
 %package -n emacs-libidn-pkg
 Summary:	IDN support files for emacs
 Summary(pl):	Obs³uga IDN dla emacsa
@@ -95,7 +119,7 @@ Summary:	Python interface to libidn
 Summary(pl):	Pythonowy interfejs do libidn
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
-%pyrequires_eq	python-lib
+%pyrequires_eq	python-libs
 
 %description -n python-idn
 Python interface to libidn (internationalized domain names library).
@@ -108,22 +132,29 @@ domen).
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+rm -f po/stamp-po
 
 %build
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I gl/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+JAR=%{_bindir}/fastjar \
 %configure \
+	%{?with_dotnet:--enable-csharp=mono}%{!?with_dotnet:--disable-csharp} \
 	%{?with_java:--enable-java} \
 	--with-lispdir=%{_emacs_lispdir}
 
 %{__make}
 
+%if %{with python}
 %{__make} -C contrib/idn-python \
-	INCLUDE="/usr/include/python2.3 %{rpmcflags} -I../../lib -L../../lib/.libs"
+	INCLUDE="%{py_incdir} %{rpmcflags} -I../../lib -L../../lib/.libs"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -131,10 +162,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with python}
 install -D contrib/idn-python/idn.so $RPM_BUILD_ROOT%{py_sitedir}/idn.so
+%endif
 
 %find_lang %{name}
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -166,6 +201,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libidn.a
 
+%if %{with dotnet}
+%files -n dotnet-libidn
+%defattr(644,root,root,755)
+# why not in gac? does it work here?
+%{_libdir}/Libidn.dll
+%endif
+
 %files -n emacs-libidn-pkg
 %defattr(644,root,root,755)
 %{_emacs_lispdir}/*.el
@@ -176,6 +218,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/java/libidn*.jar
 %endif
 
+%if %{with python}
 %files -n python-idn
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/idn.so
+%endif