- patches cleanup part 2

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index e2cc22589784be84b6ab7abc27d9bd6e48f403db..be59aa530751265c78582a0b3f7246cefdd40e7a 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,69 +1,20 @@
---- rpm-3.0.3/configure.in.wiget       Thu Sep 30 23:25:29 1999
-+++ rpm-3.0.3/configure.in     Fri Oct 29 11:43:58 1999
-@@ -903,7 +903,7 @@
- export LIBS INCPATH CONFIG_SITE
- 
- AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Makefile rpmrc macros lib/Makefile
-+AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
-       build/Makefile tools/Makefile scripts/Makefile
-       tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
-       misc/Makefile po/Makefile.in intl/Makefile
---- rpm-3.0.3/macros.in.wiget  Thu Sep 30 01:29:57 1999
-+++ rpm-3.0.3/macros.in        Fri Oct 29 11:50:10 1999
-@@ -60,8 +60,8 @@
- %_builddir            %{_topdir}/BUILD
- %_buildshell          /bin/sh
- %_bzip2bin            @BZIP2BIN@
--%_dbpath              %{_var}/lib/rpm
--%_defaultdocdir               %{_usr}/doc
-+%_dbpath              %{_var}/state/rpm
-+%_defaultdocdir               %{_usr}/share/doc
+--- 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.
  #
- %__find_provides      @FINDPROVIDES@
- %__find_requires      @FINDREQUIRES@
-@@ -70,8 +70,8 @@
- #%__find_obsoletes    ???
- #
- # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
--%_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rhf root
--%_fixgroup            [ `%{__id} -u` = '0' ] && %{__chgrp} -Rhf @ROOT_GROUP@
-+%_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rhf root.@ROOT_GROUP@
-+#%_fixgroup           [ `%{__id} -u` = '0' ] && %{__chgrp} -Rhf @ROOT_GROUP@
- %_fixperms            %{__chmod} -Rf @FIXPERMS@
- #
- %_gzipbin             @GZIPBIN@
-@@ -80,13 +80,13 @@
- %_rpmdir              %{_topdir}/RPMS
- #
- # XXX Note escaped %% for use in headerSprintf
--%_rpmfilename         %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-+%_rpmfilename         %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
- %_signature           none
- %_sourcedir           %{_topdir}/SOURCES
- %_specdir             %{_topdir}/SPECS
- %_srcrpmdir           %{_topdir}/SRPMS
- %_tmppath             %{_var}/tmp
--%_topdir              %{_usrsrc}/redhat
-+%_topdir              %(echo $HOME)/rpm
- #
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -160,14 +160,14 @@
- %_sbindir             %{_exec_prefix}/sbin
- %_libexecdir          %{_exec_prefix}/libexec
- %_datadir             %{_prefix}/share
--%_sysconfdir          %{_prefix}/etc
-+%_sysconfdir          /etc
- %_sharedstatedir      %{_prefix}/com
- %_localstatedir               %{_prefix}/var
- %_libdir              %{_exec_prefix}/lib
- %_includedir          %{_prefix}/include
- %_oldincludedir               /usr/include
--%_infodir             %{_prefix}/info
--%_mandir              %{_prefix}/man
-+%_infodir             %{_prefix}/share/info
-+%_mandir              %{_prefix}/share/man
- 
- #==============================================================================
- # ---- config.guess 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}