drop ruby macros here, duplicate. provided by rpm-build-macros

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 11504487baf111fa37dfa5f1c5f107b64f225680..263deebe02d8a7d5e0478a5322385535647a8c8c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,95 +1,22 @@
-diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
---- rpm-4.4.7.org/macros.in    2007-01-06 18:28:22.094067000 +0100
-+++ rpm-4.4.7/macros.in        2007-01-09 23:55:19.559199000 +0100
-@@ -217,10 +217,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}
-@@ -233,7 +234,7 @@
- #     Configurable build root path, same as BuildRoot: in a specfile.
- #     (Note: the configured macro value will override the spec file value).
+--- rpm-5.4.10/macros/macros.in~       2012-11-17 00:38:23.000000000 +0200
++++ rpm-5.4.10/macros/macros.in        2012-11-17 00:38:55.871401871 +0200
+@@ -670,18 +670,7 @@
+ # XXX Note: that there cannot be any whitespace within the string "p>q",
+ #     and that both p and q are package names (i.e. no version/release).
  #
--%buildroot            %{_tmppath}/%{name}-root
-+%buildroot            %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+-%_dependency_whiteout_caos_core               \
+-      perl>perl-Filter                \
+-      pam>coreutils                   \
+-      pam>initscripts                 \
+-      glibc-common>glibc              \
+-      glibc>nscd                      \
+-      filesystem>setup
+-
+-%_dependency_whiteout                 \
+-      %{?_dependency_whiteout_caos_core} \
+-      %{?_dependency_whiteout_system} \
+-      %{nil}
++%_dependency_whiteout %{nil}
  
- #     The sub-directory (relative to %{_builddir}) where sources are compiled.
- #     This macro is set after processing %setup, either explicitly from the
-@@ -331,8 +332,8 @@
- #             "w9.gzdio"      gzip level 9 (default).
- #             "w9.bzdio"      bzip2 level 9.
  #
--#%_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)
-@@ -481,7 +482,7 @@
- 
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_usr}/lib/rpm/magic
-+%_rpmfc_magic_path    /usr/share/file/magic
- 
- #==============================================================================
- # ---- Database configuration macros.
-@@ -929,10 +930,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\
-@@ -1091,7 +1092,7 @@
- %_includedir          %{_prefix}/include
- %_oldincludedir               /usr/include
- %_infodir             %{_prefix}/info
--%_mandir              %{_prefix}/man
-+%_mandir              %{_prefix}/share/man
- 
- #==============================================================================
- # ---- config.guess platform macros.
-@@ -1369,7 +1370,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
- #*/
+ # Default path used for serializing transactions with a  fcntl lock.