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 f5705f9d83ffdd9a6e14b5328f21f842618d4507..263deebe02d8a7d5e0478a5322385535647a8c8c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,43 +1,22 @@
---- rpm-4.4.3/macros.in.orig   2005-11-19 01:18:44.483914640 +0100
-+++ rpm-4.4.3/macros.in        2005-11-19 01:19:50.657854672 +0100
-@@ -219,7 +219,7 @@
- %_tmppath             %{_var}/tmp
+--- 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).
+ #
+-%_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}
  
- #     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}
-@@ -932,10 +932,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\
-@@ -1373,5 +1373,18 @@
- #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides
- #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
- 
-+# PLD rpm macros
-+%_enable_debug_packages 1
-+
-+#-----------------------------------------------------------------
-+# CFLAGS and LDFLAGS used to build
-+
-+%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-+
-+%debugcflags  -O0 -g -Wall
-+%rpmcflags    %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-+%rpmcxxflags  %{rpmcflags}
-+%rpmldflags   %{nil}
-+
- # \endverbatim
- #*/
+ #
+ # Default path used for serializing transactions with a  fcntl lock.