- updated to 1.10.1 (using rpm 4.4.1 sources); updated gettext0.11,pl.po patches

Changed files:
    popt.spec -> 1.72

diff --git a/popt.spec b/popt.spec
index 3f8eee55199d6773f5d25c47a075b9191c4aa8fc..17df5f83a253c04ca8fe4509aad3d3d1eed2974b 100644 (file)
--- a/popt.spec
+++ b/popt.spec
@@ -1,4 +1,3 @@
-%define snap 20030515
 Summary:       C library for parsing command line parameters
 Summary(de):   C-Library zum Parsen von Befehlszeilenparametern
 Summary(fr):   Bibliothèque C pour analyser les paramètres de la ligne de commande
@@ -7,19 +6,20 @@ Summary(ru):  
 Summary(tr):   Komut satýrý parametrelerini ayrýþtýrýmak için C arþivi
 Summary(uk):   â¦Â̦ÏÔÅËÁ C ÄÌÑ ÒÏÚÂÏÒÕ ÐÁÒÁÍÅÔÒ¦× ËÏÍÁÎÄÎϧ ÓÔÒ¦ÞËÉ
 Name:          popt
-Version:       1.9
-Release:       0.%{snap}.6
+Version:       1.10.1
+Release:       1
 License:       LGPL
 Group:         Libraries
-#Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.%{snap}.tar.gz
-Source0:       %{name}-%{version}.%{snap}.tar.gz
-# Source0-md5: bd43546659a4b6b1b462f62ace22a0d7
+# last version available separately:
+#Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.tar.gz
+Source0:       ftp://jbj.org/pub/rpm-4.4.x/rpm-4.4.1.tar.gz
+# Source0-md5: 90ded9047b1b69d918c6c7c7b56fd7a9
 Patch0:                %{name}-values.patch
 Patch1:                %{name}-gettext0.11.patch
 Patch2:                %{name}-pl.po.patch
 Patch3:                %{name}-libdir64.patch
 BuildRequires: autoconf >= 2.50
-BuildRequires: automake
+BuildRequires: automake >= 1.4
 BuildRequires: gettext-devel >= 0.11.5
 BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -137,7 +137,8 @@ Biblioteka statyczna popt.
 ÓËÌÁÄ popt-devel.
 
 %prep
-%setup -q
+%setup -q -n rpm-4.4.1
+cd popt
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -147,27 +148,22 @@ mv -f po/{zh_CN.GB2312,zh_CN}.po
 mv -f po/{no,nb}.po
 
 %build
+cd popt
 %{__gettextize}
-autoupdate
 %{__libtoolize}
 %{__autoheader}
 %{__aclocal}
 %{__autoconf}
 %{__automake} -i
-%configure \
-       --enable-shared
+%configure
 
-# no reason to link tests statically - omit -all-static
-%{__make} \
-       test1_LDFLAGS="" \
-       test2_LDFLAGS="" \
-       test3_LDFLAGS=""
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{_lib}
 
-%{__make} install \
+%{__make} -C popt install \
        DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib}
@@ -185,7 +181,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/*
+%doc popt/{CHANGES,README}
+%attr(755,root,root) /%{_lib}/libpopt.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)