1 --- rpm-4.4.8/macros.in 2007-04-08 20:36:08.925632417 +0200
2 +++ rpm-4.4.9/macros.in 2008-01-25 02:16:46.248708080 +0200
7 -%_defaultdocdir %{_usr}/doc
8 +%_defaultdocdir %{_usr}/share/doc
10 # The path to the pgp executable (legacy, use %{__pgp} instead).
13 # The directory where newly built source packages will be written.
14 %_srcrpmdir %{_topdir}/SRPMS
16 -# Directory where temporaray files can be created.
17 -%_tmppath %{_var}/tmp
18 +# Directory where temporary files can be created.
19 +%_tmppath %(echo "${TMPDIR:-/tmp}")
22 # Path to top of build area.
23 -%_topdir %{_usrsrc}/rpm
24 +%_topdir %(echo $HOME)/rpm
26 #==============================================================================
27 # ---- Optional rpmrc macros.
29 # Configurable build root path, same as BuildRoot: in a specfile.
30 # (Note: the configured macro value will override the spec file value).
32 -%buildroot %{_tmppath}/%{name}-root
33 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
35 # The sub-directory (relative to %{_builddir}) where sources are compiled.
36 # This macro is set after processing %setup, either explicitly from the
38 # "w9.bzdio" bzip2 level 9.
39 # "w9.lzdio" lzma level 9.
41 -#%_source_payload w9.gzdio
42 -#%_binary_payload w9.gzdio
43 +%_source_payload w9.gzdio
44 +%_binary_payload w9.lzdio
46 # Archive formats to use for source/binary package payloads.
47 # "cpio" cpio archive (default)
51 # Path to magic file used for file classification.
52 -%_rpmfc_magic_path %{_usr}/lib/rpm/magic
53 +%_rpmfc_magic_path /usr/share/file/magic
55 #==============================================================================
56 # ---- Database configuration macros.
58 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
60 unset PERL_MM_OPT || :\
68 + unset LC_MESSAGES ||:\
71 %{verbose:set -x}%{!verbose:exec > /dev/null}\
73 @@ -1127,17 +1130,17 @@
74 %_exec_prefix %{_prefix}
75 %_bindir %{_exec_prefix}/bin
76 %_sbindir %{_exec_prefix}/sbin
77 -%_libexecdir %{_exec_prefix}/libexec
78 +%_libexecdir %{_exec_prefix}/lib
79 %_datadir %{_prefix}/share
80 -%_sysconfdir %{_prefix}/etc
81 -%_sharedstatedir %{_prefix}/com
82 -%_localstatedir %{_prefix}/var
84 +%_sharedstatedir /var/lib
87 %_libdir %{_exec_prefix}/%{_lib}
88 %_includedir %{_prefix}/include
89 %_oldincludedir /usr/include
90 -%_infodir %{_prefix}/info
91 -%_mandir %{_prefix}/man
92 +%_infodir %{_prefix}/share/info
93 +%_mandir %{_prefix}/share/man
94 %_localedir %{_datadir}/locale
96 #==============================================================================
97 @@ -1429,6 +1432,24 @@
98 #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides
99 #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
100 -%__scriptlet_requires /bin/bash --rpm-requires
101 +#%__scriptlet_requires /bin/bash --rpm-requires
104 +%_enable_debug_packages 1
106 +#-----------------------------------------------------------------
107 +# CFLAGS and LDFLAGS used to build
109 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
110 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
112 +%debugcflags -O0 -g -Wall
113 +%optldflags -Wl,--as-needed -Wl,-z,relro -Wl,-z,-combreloc
115 +# Warning: those macros are overwritten by macros.build,
116 +# left here for compatibility
117 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
118 +%rpmcxxflags %{rpmcflags}
119 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
123 --- rpm-4.4.8/configure.ac.orig 2007-04-08 20:24:47.210783702 +0200
124 +++ rpm-4.4.8/configure.ac 2007-04-08 20:32:18.216485052 +0200
125 @@ -1462,7 +1462,7 @@
126 [Full path to rpm system configuration directory (usually /etc/rpm)])
127 AC_SUBST(SYSCONFIGDIR)
129 -MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
130 +MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
131 AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
132 [Colon separated paths of macro files to read.])