- updated to 1.10.5 (using rpm-4.4.5 sources - no separate tarball yet)

- updated gettext0.11,pl.po patches
- removed values patch (obsolete since popt-1.6.1/rpm-4.0.1)

Changed files:
    popt.spec -> 1.79

diff --git a/popt.spec b/popt.spec
index 5841fe85e6b0fa982c20273eab0216a3540d475a..fd6d2c59084e0d9b6980ee55a1290d2269ce34c2 100644 (file)
--- a/popt.spec
+++ b/popt.spec
@@ -10,16 +10,16 @@ Summary(ru):        
 Summary(tr):   Komut satýrý parametrelerini ayrýþtýrýmak için C arþivi
 Summary(uk):   â¦Â̦ÏÔÅËÁ C ÄÌÑ ÒÏÚÂÏÒÕ ÐÁÒÁÍÅÔÒ¦× ËÏÍÁÎÄÎϧ ÓÔÒ¦ÞËÉ
 Name:          popt
-Version:       1.10.4
+Version:       1.10.5
 Release:       1
 License:       X Consortium (MIT-like)
 Group:         Libraries
-Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
-# Source0-md5: 63b943522a6788ae8f756ca123d83c00
-Patch0:                %{name}-values.patch
-Patch1:                %{name}-gettext0.11.patch
-Patch2:                %{name}-pl.po.patch
-Patch3:                %{name}-libdir64.patch
+#Source0:      ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
+Source0:       ftp://jbj.org/pub/rpm-4.4.x/rpm-4.4.5.tar.gz
+# Source0-md5: d5f434789c0c56d05d77be6f4262a561
+Patch0:                %{name}-gettext0.11.patch
+Patch1:                %{name}-pl.po.patch
+Patch2:                %{name}-libdir64.patch
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.4
 BuildRequires: gettext-devel >= 0.11.5
@@ -139,16 +139,18 @@ Biblioteka statyczna popt.
 ÓËÌÁÄ popt-devel.
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n rpm-4.4.5
+cd popt
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 mv -f po/{eu_ES,eu}.po
 mv -f po/{no,nb}.po
 
 %build
+cd popt
 %{__gettextize}
 %{__libtoolize}
 %{__autoheader}
@@ -164,7 +166,7 @@ mv -f po/{no,nb}.po
 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}
@@ -182,7 +184,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc CHANGES COPYING README
+#%doc CHANGES COPYING README
+%doc popt/{CHANGES,COPYING,README}
 %attr(755,root,root) /%{_lib}/libpopt.so.*.*.*
 
 %files devel