- now it compiles with new gettext

- release 2

Changed files:
    popt.spec -> 1.39.2.2

diff --git a/popt.spec b/popt.spec
index af6e3f7f36af72184e44e853123575a1eeaa4699..c2696b8b3f48b3c78bd0aa7b8ca62a652504983b 100644 (file)
--- a/popt.spec
+++ b/popt.spec
@@ -5,16 +5,17 @@ Summary(pl):  Biblioteka C do przetwarzania parametr
 Summary(tr):   Komut satýrý parametrelerini ayrýþtýrýmak için C arþivi
 Name:          popt
 Version:       1.6.4
-Release:       1
+Release:       2
 License:       LGPL
 Group:         Libraries
 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz
 Patch0:                %{name}-values.patch
 Patch1:                %{name}-ff.patch
+Patch2:                %{name}-gettext0.11.patch
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel >= 0.11.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -90,15 +91,20 @@ Biblioteka statyczna do popt.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -f missing
+%{__gettextize} --no-changelog
+mv Makefile.am~ Makefile.am
+mv configure.in~ configure.in
+[ -f po/Makevars ] || cp po/Makevars.template po/Makevars
 autoupdate
 libtoolize --force
 autoheader
-aclocal
-autoconf
-automake -a -c -i
+%{__aclocal}
+%{__autoconf}
+%{__automake} -i
 %configure \
        --enable-shared
 %{__make}