SPECS (Titanium): rpm.spec - merged from rpm-4_4_9 branch: - add...

[hawk]

Author: hawk                         Date: Sat Feb  2 16:32:03 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- merged from rpm-4_4_9 branch:
  - added rpm-v3-support.patch
  - allow skipping implicit rm -rf from %clean with %__spec_clean_body redefine
  - do not be so evil to skip %clean from specfile
  - use php-pear autodep scripts from AC-branch
  - do not install or package find-php-{requires,provides} (outdated)
  - find-lang 1.27

---- Files affected:
SPECS:
   rpm.spec (1.837.4.7 -> 1.837.4.8) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.4.7 SPECS/rpm.spec:1.837.4.8
--- SPECS/rpm.spec:1.837.4.7	Fri Jan 25 17:17:10 2008
+++ SPECS/rpm.spec	Sat Feb  2 17:31:58 2008
@@ -26,7 +26,7 @@
 %define	reqdb_ver	4.5.20
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
-%define	find_lang_rev	1.25
+%define	find_lang_rev	1.27
 %define	sover	4.4
 Summary:	RPM Package Manager
 Summary(de.UTF-8):	RPM Packet-Manager
@@ -37,7 +37,7 @@
 Summary(uk.UTF-8):	ĐœĐľĐ˝ĐľĐ´ĐśĐľŃ€ пакотів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	14
+Release:	15
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -125,6 +125,8 @@
 Patch64:	%{name}-tar_as_secondary_source.patch
 Patch65:	%{name}-man_pl.patch
 Patch66:	%{name}-lzma-tukaani.patch
+Patch67:	%{name}-v3-support.patch
+Patch68:	%{name}-cleanbody.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -704,15 +706,13 @@
 %patch64 -p1
 %patch65 -p1
 %patch66 -p1
+%patch67 -p1
+%patch68 -p1
 
-cd scripts
-mv -f perl.req perl.req.in
-mv -f perl.prov perl.prov.in
-cd ..
-
+mv -f scripts/{perl.req,perl.req.in}
+mv -f scripts/{perl.prov,perl.prov.in}
 mv -f po/{no,nb}.po
 mv -f po/{sr,sr at Latn}.po
-
 rm -rf sqlite zlib db db3 popt rpmdb/db.h
 
 # generate Group translations to *.po
@@ -866,7 +866,6 @@
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
 install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
 install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
-install scripts/find-php*	$RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
@@ -1236,7 +1235,6 @@
 %files php-pearprov
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_rpmlibdir}/php*
-%attr(755,root,root) %{_rpmlibdir}/find-php*
 
 %if %{with python}
 %files -n python-rpm
@@ -1258,6 +1256,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.4.8  2008-02-02 16:31:58  hawk
+- merged from rpm-4_4_9 branch:
+  - added rpm-v3-support.patch
+  - allow skipping implicit rm -rf from %clean with %__spec_clean_body redefine
+  - do not be so evil to skip %clean from specfile
+  - use php-pear autodep scripts from AC-branch
+  - do not install or package find-php-{requires,provides} (outdated)
+  - find-lang 1.27
+
 Revision 1.837.4.7  2008-01-25 16:17:10  hawk
 - merged from rpm-4_4_9 branch:
   - C: for non-tukaani lzma
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.4.7&r2=1.837.4.8&f=u