- added without python bcond

[packages/libidn.git] / libidn.spec

diff --git a/libidn.spec b/libidn.spec
index 60a4142c280c070c1b50f72d09bf7bf7506e8f96..be2c308512b580e50cb18d46902d1054dd69218a 100644 (file)
--- a/libidn.spec
+++ b/libidn.spec
@@ -2,26 +2,28 @@
 # - prepare package with web-files and java from contrib
 #
 # Conditional build:
-%bcond_with    java    # build Java implementation (but Punycode*.java missing from tar???)
+%bcond_with    java    # build Java implementation
+%bcond_without python  # don't build python interface
 #
 Summary:       Internationalized string processing library
 Summary(pl):   Biblioteka do przetwarzania umiêdzynarodowionych ³añcuchów
 Name:          libidn
-Version:       0.4.3
+Version:       0.5.20
 Release:       1
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://josefsson.org/libidn/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 037271567340efbe8b23d0aa6c50ea4a
+# Source0-md5: b8ccbdf43b8da1722a6773c4e426d059
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-python.patch
 URL:           http://www.gnu.org/software/libidn/
-BuildRequires: autoconf >= 2.57
-BuildRequires: automake >= 1.8
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1:1.9
 BuildRequires: gettext-devel >= 0.14.1
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libtool >= 2:1.5
-BuildRequires: python-devel
+BuildRequires: perl-base
+%{?with_python:BuildRequires:  python-devel >= 1:2.3}
 BuildRequires: texinfo >= 4.7
 Requires(post,postun): /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -94,7 +96,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).
@@ -111,7 +113,7 @@ domen).
 %build
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I gl/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -121,8 +123,10 @@ domen).
 
 %{__make}
 
+%if %{with python}
 %{__make} -C contrib/idn-python \
-       INCLUDE="/usr/include/python2.3 %{rpmcflags} -I../../lib -L../../lib/.libs"
+       INCLUDE="/usr/include/python2.4 -I/usr/include/python2.3 %{rpmcflags} -I../../lib -L../../lib/.libs"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -130,7 +134,9 @@ 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}
 
@@ -172,9 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files -n java-libidn
 %defattr(644,root,root,755)
-%{_datadir}/java/libidn.jar
+%{_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