- patches cleanup part 2

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 799bbbef3e02cea9627c9f926f07fbf940bdb7c7..be59aa530751265c78582a0b3f7246cefdd40e7a 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,35 +1,20 @@
---- 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-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.
  #
--%_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
- 
- #==============================================================================
- # ---- per-platform macros.
+ %_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}