SPECS (rpm-4_5): rpm.spec - more complete LSB rpm v3 support from mandriva ...

[glen]

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

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.26 -> 1.837.2.42.2.49.2.27) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.26 SPECS/rpm.spec:1.837.2.42.2.49.2.27
--- SPECS/rpm.spec:1.837.2.42.2.49.2.26	Sun Oct  5 00:37:26 2008
+++ SPECS/rpm.spec	Sun Oct 26 20:05:36 2008
@@ -150,6 +150,10 @@
 Patch80:	%{name}-link-selinux.patch
 Patch81:	%{name}-db-configure.patch
 Patch82:	%{name}-perl-makefile.patch
+Patch83:	%{name}-nosmpflags.patch
+Patch84:	%{name}-hirmib-ts.patch
+Patch85:	%{name}-perl_req-heredocs_pod.patch
+Patch86:	%{name}-rpmv3-support.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -747,6 +751,10 @@
 %patch77 -p0
 %patch79 -p1
 %patch80 -p1
+%patch83 -p1
+%patch84 -p1
+%patch85 -p1
+%patch86 -p1
 
 mv -f po/{sr,sr at Latn}.po
 rm -rf sqlite zlib popt
@@ -973,30 +981,14 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Providename
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename
 
-%if "%{pld_release}" == "ti"
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
 #
-#%%_install_langs pl_PL:en_US
+%if "%{pld_release}" == "ti"
 %%distribution PLD Titanium
-#
-# remove or replace with file_contexts path if you want to use custom
-# SELinux file contexts policy instead of one stored in packages payload
-%%_install_file_context_path	%%{nil}
-%%_verify_file_context_path	%%{nil}
-
-# If non-zero, all erasures will be automagically repackaged.
-%%_repackage_all_erasures	0
-
-# If non-zero, create debuginfo packages
-%%_enable_debug_packages		0
-EOF
 %else
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
-# customized rpm macros - global for host
-#
-#%%_install_langs pl_PL:en_US
 %%distribution PLD
+%endif
 #
 # remove or replace with file_contexts path if you want to use custom
 # SELinux file contexts policy instead of one stored in packages payload
@@ -1004,13 +996,23 @@
 %%_verify_file_context_path	%%{nil}
 
 # If non-zero, all erasures will be automagically repackaged.
-#%%_repackage_all_erasures    1
+#%%_repackage_all_erasures	1
+
+# If non-zero, create debuginfo packages
+#%%_enable_debug_packages	1
 
 # Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
 # marked as %doc should be installed.
 #%%_excludedocs   1
 EOF
-%endif
+
+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
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
 # global list of files (regexps) which don't generate Provides
@@ -1412,6 +1414,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.27  2008/10/26 19:05:36  glen
+- more complete LSB rpm v3 support from mandriva (can open ooo rpm-s now)
+- use RPMTAG_INSTALLTIME instead of RPMTAG_INSTALLTID when filling hrmib cache
+- %_smp_mflags cames from rpm-build-macros, don't let platform.in overwrite it
+- move %_install_langs to separate file: /etc/rpm/macros.lang (for better rpm updates)
+
 Revision 1.837.2.42.2.49.2.26  2008/10/04 22:37:26  glen
 - fix perl build without neon
 
================================================================

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