- don't install and package some useless scripts

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 2f96d3077116a0e384b76c8478f6f64eedf21624..8ea2bec79becd0d9c9f33c9f8df946153bddbfa0 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,70 +1,39 @@
-diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
---- rpm-4.4.6.orig/macros.in   2006-08-05 20:52:48.000000000 +0200
-+++ rpm-4.4.6.macros/macros.in 2006-08-05 20:53:57.000000000 +0200
-@@ -219,7 +219,7 @@
- %_tmppath             %{_var}/tmp
+--- rpm-5.4.16/macros/macros.in~       2016-03-16 00:27:05.000000000 +0200
++++ rpm-5.4.16/macros/macros.in        2016-03-16 00:27:42.513047506 +0200
+@@ -561,9 +561,10 @@
  
- #     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}
-@@ -330,8 +330,8 @@
- #             "w9.gzdio"      gzip level 9 (default).
- #             "w9.bzdio"      bzip2 level 9.
+ # Horowitz Key Protocol server configuration
  #
--#%_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 +481,7 @@
+-%_hkp_keyserver         hkp://keys.rpm5.org
++#%_hkp_keyserver         hkp://keys.rpm5.org
+ #%_hkp_keyserver         hkp://keys.n3npq.net
+ #%_hkp_keyserver         hkp://pool.sks-keyservers.net
++%_hkp_keyserver         hkp://ha.pool.sks-keyservers.net
+ %_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=
  
+
+@@ -698,23 +698,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).
  #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_usr}/lib/rpm/magic
-+%_rpmfc_magic_path    /usr/share/file/magic
+-%_dependency_whiteout_caos_core               \
+-      perl>perl-Filter                \
+-      pam>coreutils                   \
+-      pam>initscripts                 \
+-      glibc-common>glibc              \
+-      glibc>nscd                      \
+-      filesystem>setup
+-
+-%_dependency_whiteout_OWL31           \
+-      dhcp-server>dhcp                \
+-      which>bash                      \
+-
+-
+-%_dependency_whiteout                 \
+-      %{?_dependency_whiteout_OWL31} \
+-      %{?_dependency_whiteout_system} \
+-      %{nil}
++%_dependency_whiteout %{nil}
  
- #==============================================================================
- # ---- Database configuration macros.
-@@ -909,10 +909,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\
-@@ -1350,5 +1350,23 @@
- #%__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: -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.