X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=664ad0bd79002f7bd192cd6fcc83444d82123acb;hb=595ba5b7643e1b6e00c71c91c9e9492ba078737f;hp=996e4aadc76028f09732d368e47c62fb54d1db75;hpb=7bd786ede6e26f8a425ccd7e5f874c5875460385;p=packages%2Frpm.git diff --git a/rpm-macros.patch b/rpm-macros.patch index 996e4aa..664ad0b 100644 --- a/rpm-macros.patch +++ b/rpm-macros.patch @@ -1,71 +1,115 @@ -diff -Nru rpm-4.0/configure.in rpm-4.0.new/configure.in ---- rpm-4.0/configure.in Tue Aug 29 22:55:50 2000 -+++ rpm-4.0.new/configure.in Wed Nov 15 19:15:17 2000 -@@ -951,7 +951,7 @@ - dnl export LIBS INCPATH CONFIG_SITE +diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in +--- rpm-4.4.7.org/macros.in 2006-09-24 21:29:28.000000000 +0200 ++++ rpm-4.4.7/macros.in 2007-01-24 11:20:36.000000000 +0100 +@@ -181,7 +181,7 @@ + %endif\ + %{nil} - AC_CONFIG_SUBDIRS(popt) --AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat -+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat - rpmio/Makefile lib/Makefile build/Makefile tools/Makefile - scripts/Makefile - tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile -diff -Nru rpm-4.0/macros.in rpm-4.0.new/macros.in ---- rpm-4.0/macros.in Mon Aug 28 17:24:45 2000 -+++ rpm-4.0.new/macros.in Wed Nov 15 19:12:09 2000 -@@ -88,7 +88,7 @@ - %_bzip2bin @BZIP2BIN@ - %_dbpath %{_var}/lib/rpm - %_dbpath_rebuild %{_dbpath} -%_defaultdocdir %{_usr}/doc +%_defaultdocdir %{_usr}/share/doc + + # The path to the gzip executable (legacy, use %{__gzip} instead). + %_gzipbin %{__gzip} +@@ -212,10 +212,11 @@ + %_srcrpmdir %{_topdir}/SRPMS + + # Directory where temporaray files can be created. +-%_tmppath %{_var}/tmp ++%_tmppath %(echo "${TMPDIR:-/tmp}") ++%tmpdir %{_tmppath} + + # Path to top of build area. +-%_topdir %{_usrsrc}/rpm ++%_topdir %(echo $HOME)/rpm + + # The path to the unzip executable (legacy, use %{__unzip} instead). + %_unzipbin %{__unzip} +@@ -228,7 +229,7 @@ + # Configurable build root path, same as BuildRoot: in a specfile. + # (Note: the configured macro value will override the spec file value). # - %__find_provides @FINDPROVIDES@ - %__find_requires @FINDREQUIRES@ -@@ -100,8 +100,8 @@ - %__id_u @__ID_U@ - %__chown_Rhf @__CHOWN_RHF@ - %__chgrp_Rhf @__CHGRP_RHF@ --%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root --%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@ -+%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root.@ROOT_GROUP@ -+#%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@ - %_fixperms %{__chmod} -Rf @FIXPERMS@ +-%buildroot %{_tmppath}/%{name}-root ++%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n) + + # The sub-directory (relative to %{_builddir}) where sources are compiled. + # This macro is set after processing %setup, either explicitly from the +@@ -326,8 +327,8 @@ + # "w9.gzdio" gzip level 9 (default). + # "w9.bzdio" bzip2 level 9. # - %_gzipbin @GZIPBIN@ -@@ -110,13 +110,13 @@ - %_rpmdir %{_topdir}/RPMS +-#%_source_payload w9.gzdio +-#%_binary_payload w9.gzdio ++%_source_payload w9.gzdio ++%_binary_payload w9.lzdio + + # Archive formats to use for source/binary package payloads. + # "cpio" cpio archive (default) +@@ -473,7 +474,7 @@ + # - # XXX Note escaped %% for use in headerSprintf --%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm -+%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm - %_signature none - %_sourcedir %{_topdir}/SOURCES - %_specdir %{_topdir}/SPECS - %_srcrpmdir %{_topdir}/SRPMS - %_tmppath %{_var}/tmp --%_topdir %{_usrsrc}/redhat -+%_topdir %(echo $HOME)/rpm + # Path to magic file used for file classification. +-%_rpmfc_magic_path %{_usr}/lib/rpm/magic ++%_rpmfc_magic_path /usr/share/file/magic #============================================================================== - # ---- Optional rpmrc macros. -@@ -455,15 +455,15 @@ - %_sbindir %{_exec_prefix}/sbin - %_libexecdir %{_exec_prefix}/libexec - %_datadir %{_prefix}/share --%_sysconfdir %{_prefix}/etc -+%_sysconfdir /etc - %_sharedstatedir %{_prefix}/com --%_localstatedir %{_prefix}/var -+%_localstatedir /var - %_lib lib - %_libdir %{_exec_prefix}/%{_lib} + # ---- Database configuration macros. +@@ -921,10 +922,10 @@ + export RPM_BUILD_ROOT}\ + %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ + export CLASSPATH}\ +- unset PERL_MM_OPT\ ++ unset PERL_MM_OPT || :\ + LANG=C\ + export LANG\ +- unset DISPLAY\ ++ unset DISPLAY || :\ + \ + %{verbose:set -x}%{!verbose:exec > /dev/null}\ + umask 022\ +@@ -1083,7 +1084,7 @@ %_includedir %{_prefix}/include %_oldincludedir /usr/include --%_infodir %{_prefix}/info + %_infodir %{_prefix}/info -%_mandir %{_prefix}/man -+%_infodir /usr/share/info +%_mandir %{_prefix}/share/man #============================================================================== # ---- config.guess platform macros. +@@ -1361,7 +1362,25 @@ + # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}. + #%__executable_provides @RPMCONFIGDIR@/executabledeps.sh --provides + #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires +-%__scriptlet_requires /bin/bash --rpm-requires ++#%__scriptlet_requires /bin/bash --rpm-requires ++ ++# PLD rpm macros ++%_enable_debug_packages 1 ++ ++#----------------------------------------------------------------- ++# CFLAGS and LDFLAGS used to build ++ ++%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} ++# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. ++ ++%debugcflags -O0 -g -Wall ++%optldflags -Wl,--as-needed ++ ++# Warning: those macros are overwritten by macros.build, ++# left here for compatibility ++%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} ++%rpmcxxflags %{rpmcflags} ++%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} + + # \endverbatim + #*/ +--- rpm/configure.ac.org 2007-02-08 09:16:46.554623000 +0100 ++++ rpm/configure.ac 2007-02-08 09:18:16.386623000 +0100 +@@ -1368,7 +1368,7 @@ + [Full path to rpm system configuration directory (usually /etc/rpm)]) + AC_SUBST(SYSCONFIGDIR) + +-MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" ++MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/macros.build:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros" + AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", + [Colon separated paths of macro files to read.]) + AC_SUBST(MACROFILES)