SOURCES: rpm-macros.patch - obsolete -provides-dont-obsolete.patch
arekm
arekm at pld-linux.org
Tue Oct 2 15:48:19 CEST 2007
Author: arekm Date: Tue Oct 2 13:48:19 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- obsolete -provides-dont-obsolete.patch
---- Files affected:
SOURCES:
rpm-macros.patch (1.43 -> 1.44)
---- Diffs:
================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.43 SOURCES/rpm-macros.patch:1.44
--- SOURCES/rpm-macros.patch:1.43 Tue Oct 2 15:41:18 2007
+++ SOURCES/rpm-macros.patch Tue Oct 2 15:48:14 2007
@@ -1,6 +1,6 @@
--- rpm-4.4.8/macros.in.orig 2007-04-08 20:24:47.206783474 +0200
+++ rpm-4.4.8/macros.in 2007-04-08 20:36:08.925632417 +0200
-@@ -206,7 +206,7 @@
+@@ -208,7 +208,7 @@
%endif\
%{nil}
@@ -9,7 +9,7 @@
# The path to the pgp executable (legacy, use %{__pgp} instead).
%_pgpbin %{__pgp}
-@@ -233,12 +233,12 @@
+@@ -237,12 +237,12 @@
# The directory where newly built source packages will be written.
%_srcrpmdir %{_topdir}/SRPMS
@@ -25,7 +25,7 @@
#==============================================================================
# ---- Optional rpmrc macros.
-@@ -248,7 +248,7 @@
+@@ -252,7 +252,7 @@
# Configurable build root path, same as BuildRoot: in a specfile.
# (Note: the configured macro value will override the spec file value).
#
@@ -34,7 +34,7 @@
# The sub-directory (relative to %{_builddir}) where sources are compiled.
# This macro is set after processing %setup, either explicitly from the
-@@ -347,8 +347,8 @@
+@@ -351,8 +351,8 @@
# "w9.bzdio" bzip2 level 9.
# "w9.lzdio" lzma level 9.
#
@@ -45,7 +45,7 @@
# Archive formats to use for source/binary package payloads.
# "cpio" cpio archive (default)
-@@ -498,7 +498,7 @@
+@@ -517,7 +517,7 @@
#
# Path to magic file used for file classification.
@@ -54,7 +54,7 @@
#==============================================================================
# ---- Database configuration macros.
-@@ -1127,17 +1127,17 @@
+@@ -1219,17 +1219,17 @@
%_exec_prefix %{_prefix}
%_bindir %{_exec_prefix}/bin
%_sbindir %{_exec_prefix}/sbin
@@ -78,7 +78,7 @@
%_localedir %{_datadir}/locale
#==============================================================================
-@@ -1428,7 +1428,25 @@
+@@ -1530,7 +1530,28 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
#%__executable_provides %{_rpmhome}/executabledeps.sh --provides
#%__executable_requires %{_rpmhome}/executabledeps.sh --requires
@@ -87,6 +87,9 @@
+# PLD rpm macros
+%_enable_debug_packages 1
++
++# provides don't obsolete
++%_upgrade_tag name
+
+#-----------------------------------------------------------------
+# CFLAGS and LDFLAGS used to build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-macros.patch?r1=1.43&r2=1.44&f=u
More information about the pld-cvs-commit
mailing list