SPECS (rpm-4_4_9): rpm.spec - more complete LSB rpm v3 support from mandriv...

[glen]

Author: glen                         Date: Sun Oct 26 18:40:36 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- more complete LSB rpm v3 support from mandriva (can open ooo rpm-s now); rel 89
- use RPMTAG_INSTALLTIME instead of RPMTAG_INSTALLTID when filling hrmib cache; rel 87
- %_smp_mflags cames from rpm-build-macros, don't let platform.in overwrite it; rel 86
- move %_install_langs to separate file: /etc/rpm/macros.lang (for better rpm updates); rel 85

---- Files affected:
SPECS:
   rpm.spec (1.837.2.96 -> 1.837.2.97) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.96 SPECS/rpm.spec:1.837.2.97
--- SPECS/rpm.spec:1.837.2.96	Sun Oct 26 11:00:27 2008
+++ SPECS/rpm.spec	Sun Oct 26 19:40:30 2008
@@ -40,7 +40,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	83
+Release:	89
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -136,6 +136,7 @@
 Patch68:	%{name}-rpm5-patchset-9486.patch
 Patch69:	%{name}-popt-aliases.patch
 Patch70:	%{name}-lualeak.patch
+# q>p reverse patch
 #Patch71:	%{name}-rpm5-patchset-10061.patch
 Patch72:	%{name}-rpm5-patchset-7657.patch
 Patch73:	%{name}-namespace-probe.patch
@@ -144,7 +145,10 @@
 Patch76:	%{name}-link.patch
 Patch77:	%{name}-perl_req-use_base.patch
 Patch78:	%{name}-perl_req-skip_multiline.patch
-Patch79:	%{name}-perl_req-heredocs_pod.patch
+Patch79:	%{name}-nosmpflags.patch
+Patch80:	%{name}-hirmib-ts.patch
+Patch81:	%{name}-perl_req-heredocs_pod.patch
+Patch82:	%{name}-rpmv3-support.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -738,6 +742,9 @@
 %patch77 -p1
 %patch78 -p1
 %patch79 -p1
+%patch80 -p1
+%patch81 -p1
+%patch82 -p1
 
 mv -f scripts/{perl.req,perl.req.in}
 mv -f scripts/{perl.prov,perl.prov.in}
@@ -945,7 +952,6 @@
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
 #
-#%%_install_langs pl_PL:en_US
 %%distribution PLD Titanium
 #
 # remove or replace with file_contexts path if you want to use custom
@@ -960,12 +966,19 @@
 %%_enable_debug_packages		0
 EOF
 
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang <<EOF
+# Customized rpm macros - global for host
+#	A colon separated list of desired locales to be installed;
+#	"all" means install all locale specific files.
+#
+#%%_install_langs pl_PL:en_US
+EOF
+
 %else
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
 #
-#%%_install_langs pl_PL:en_US
 %%distribution PLD
 #
 # remove or replace with file_contexts path if you want to use custom
@@ -980,6 +993,14 @@
 # marked as %doc should be installed.
 #%%_excludedocs   1
 EOF
+
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang <<EOF
+# Customized rpm macros - global for host
+#	A colon separated list of desired locales to be installed;
+#	"all" means install all locale specific files.
+#
+#%%_install_langs pl_PL:en_US
+EOF
 %endif
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
@@ -1138,11 +1159,13 @@
 #%attr(755,root,root) %{_bindir}/rpmverify
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros.lang
 %dir %{_sysconfdir}/rpm/sysinfo
 # these are ok to be replaced
 %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/*
 %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform
 
+
 %{_mandir}/man8/rpm.8*
 %lang(fr) %{_mandir}/fr/man8/rpm.8*
 %lang(ja) %{_mandir}/ja/man8/rpm.8*
@@ -1356,6 +1379,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.97  2008/10/26 18:40:30  glen
+- more complete LSB rpm v3 support from mandriva (can open ooo rpm-s now); rel 89
+- use RPMTAG_INSTALLTIME instead of RPMTAG_INSTALLTID when filling hrmib cache; rel 87
+- %_smp_mflags cames from rpm-build-macros, don't let platform.in overwrite it; rel 86
+- move %_install_langs to separate file: /etc/rpm/macros.lang (for better rpm updates); rel 85
+
 Revision 1.837.2.96  2008/10/26 10:00:27  radek
 - release 83: perl_req-heredocs_pod.patch
 
================================================================

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