add support for aarch64

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index be59aa530751265c78582a0b3f7246cefdd40e7a..3565601f747c320f8d6afe83314df34539d4bea2 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,20 +1,34 @@
---- rpm-4.0.2/macros.in.wiget  Mon Dec 11 19:40:56 2000
-+++ rpm-4.0.2/macros.in        Fri Aug 10 12:20:45 2001
-@@ -476,17 +476,14 @@
- #     Macro(s) similar to the tokens used by configure.
+--- 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
+@@ -561,9 +561,10 @@
+ 
+ # Horowitz Key Protocol server configuration
  #
- %_build                       %{_host}
--%_build_alias         %{_host_alias}
- %_build_cpu           %{_host_cpu}
- %_build_vendor                %{_host_vendor}
- %_build_os            %{_host_os}
- %_host                        @host@
--%_host_alias          @host_alias@
- %_host_cpu            @host_cpu@
- %_host_vendor         @host_vendor@
- %_host_os             @host_os@
- %_target              %{_host}
--%_target_alias                %{_host_alias}
- %_target_cpu          %{_host_cpu}
- %_target_vendor               %{_host_vendor}
- %_target_os           %{_host_os}
+-%_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=
+ 
+
+@@ -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}
+ 
+ #
+ # Default path used for serializing transactions with a  fcntl lock.