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 799bbbef3e02cea9627c9f926f07fbf940bdb7c7..263deebe02d8a7d5e0478a5322385535647a8c8c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,35 +1,22 @@
---- rpm-2.92/macros.in.old     Sun Mar 14 01:34:58 1999
-+++ rpm-2.92/macros.in Sun Mar 28 17:18:20 1999
-@@ -38,19 +38,19 @@
- #     These are the default values that will be overridden by any
- #     explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
+--- 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).
  #
--%_builddir            %{_topdir}/BUILD
--%_bzip2bin            @BZIP2BIN@
--%_dbpath              %{_var}/lib/rpm
--%_defaultdocdir               /usr/doc
--%_fixperms            @FIXPERMS@
--%_gzipbin             @GZIPBIN@
--%_rpmdir              %{_topdir}/RPMS
--%_rpmfilename         %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
--%_sourcedir           %{_topdir}/SOURCES
--%_specdir             %{_topdir}/SPECS
--%_srcrpmdir           %{_topdir}/SRPMS
--%_tmppath             %{_var}/tmp
--%_topdir              %{_usrsrc}/redhat
-+#%_builddir           %{_topdir}/BUILD
-+#%_bzip2bin           @BZIP2BIN@
-+#%_dbpath             %{_var}/lib/rpm
-+#%_defaultdocdir              /usr/doc
-+#%_fixperms           @FIXPERMS@
-+#%_gzipbin            @GZIPBIN@
-+#%_rpmdir             %{_topdir}/RPMS
-+#%_rpmfilename                %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
-+#%_sourcedir          %{_topdir}/SOURCES
-+#%_specdir            %{_topdir}/SPECS
-+#%_srcrpmdir          %{_topdir}/SRPMS
-+#%_tmppath            %{_var}/tmp
-+#%_topdir             %{_usrsrc}/redhat
+-%_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}
  
- #==============================================================================
- # ---- per-platform macros.
+ #
+ # Default path used for serializing transactions with a  fcntl lock.