SPECS: popt.spec - updated to 1.10.5 (using rpm-4.4.5 sources - no...

[qboosh]

Author: qboosh                       Date: Tue Feb 28 19:12:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 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)

---- Files affected:
SPECS:
   popt.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/popt.spec
diff -u SPECS/popt.spec:1.78 SPECS/popt.spec:1.79
--- SPECS/popt.spec:1.78	Wed Dec 14 22:41:10 2005
+++ SPECS/popt.spec	Tue Feb 28 20:12:31 2006
@@ -11,16 +11,16 @@
 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
@@ -140,16 +140,18 @@
 ÓËĚÁÄ 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}
@@ -165,7 +167,7 @@
 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}
@@ -183,7 +185,8 @@
 
 %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
@@ -205,6 +208,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2006/02/28 19:12:31  qboosh
+- 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)
+
 Revision 1.78  2005/12/14 21:41:10  qboosh
 - updated to 1.10.4, updated gettext0.11 patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/popt.spec?r1=1.78&r2=1.79&f=u