SPECS: rpm.spec - updated system_libs, etc_dir, system_libs-more, php...

[qboosh]

Author: qboosh                       Date: Sat Jul 23 13:59:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated system_libs,etc_dir,system_libs-more,php-deps,debuginfo,doxygen_hack,
  no-neon,no-sqlite,pl.po,rpmpopt,po patches
- removed obsolete no-bin-env,gcc4,file-update patches
- updated rpm.groups (de.po uses UTF-8 now)
- rpmdb python module has been dropped, python >= 2.3 is required

---- Files affected:
SPECS:
   rpm.spec (1.677 -> 1.678) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.677 SPECS/rpm.spec:1.678
--- SPECS/rpm.spec:1.677	Sat Jul 23 13:27:41 2005
+++ SPECS/rpm.spec	Sat Jul 23 15:59:30 2005
@@ -76,7 +76,7 @@
 Patch16:	%{name}-php-deps.patch
 Patch17:	%{name}-ldconfig-always.patch
 Patch18:	%{name}-perl_req.patch
-Patch19:	%{name}-no-bin-env.patch
+
 Patch20:	%{name}-magic-usesystem.patch
 Patch21:	%{name}-dontneedutils.patch
 Patch22:	%{name}-provides-dont-obsolete.patch
@@ -95,7 +95,7 @@
 Patch35:	%{name}-perl_req-INC_dirs.patch
 Patch36:	%{name}-debuginfo.patch
 Patch37:	%{name}-doxygen_hack.patch
-Patch38:	%{name}-gcc4.patch
+
 Patch39:	%{name}-pythondeps.patch
 Patch40:	%{name}-print-requires.patch
 Patch41:	%{name}-reduce-stack-usage.patch
@@ -103,7 +103,6 @@
 Patch43:	%{name}-patch-quote.patch
 Patch44:	%{name}-no-neon.patch
 Patch45:	%{name}-no-sqlite.patch
-Patch46:	%{name}-file-update.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
@@ -127,8 +126,8 @@
 %endif
 BuildRequires:	patch >= 2.2
 BuildRequires:	popt-devel >= %{reqpopt_ver}
-%{?with_python:BuildRequires:	python-devel >= 2.2}
-BuildRequires:	python-modules >= 2.2
+%{?with_python:BuildRequires:	python-devel >= 1:2.3}
+BuildRequires:	python-modules >= 1:2.3
 BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	zlib-devel
@@ -604,7 +603,6 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -635,7 +633,6 @@
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
@@ -643,11 +640,10 @@
 %patch43 -p1
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
-%patch46 -p1
 %patch0 -p1
 %patch3 -p1
 
-cd scripts;
+cd scripts
 mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in
 cd ..
@@ -1083,11 +1079,8 @@
 %if %{with python}
 %files -n python-rpm
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.so
 %attr(755,root,root) %{py_sitedir}/rpm/*.so
 %attr(755,root,root) %{py_sitedir}/rpm/*.py[co]
-%attr(755,root,root) %{py_sitedir}/rpmdb/*.so
-%{py_sitedir}/rpmdb/*.py*
 %endif
 
 %if %{with apidocs}
@@ -1102,6 +1095,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.678  2005/07/23 13:59:30  qboosh
+- updated system_libs,etc_dir,system_libs-more,php-deps,debuginfo,doxygen_hack,
+  no-neon,no-sqlite,pl.po,rpmpopt,po patches
+- removed obsolete no-bin-env,gcc4,file-update patches
+- updated rpm.groups (de.po uses UTF-8 now)
+- rpmdb python module has been dropped, python >= 2.3 is required
+
 Revision 1.677  2005/07/23 11:27:41  qboosh
 - starting 4.4.2: fetch source
 - use popt 1.10.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.677&r2=1.678&f=u