- change db patch to %{_var}/state/rpm.

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 969c844a80824aafbe90c2c76896c4f68a3d382c..4fc43638c85839b46ed609717c4b5da70c1c13ca 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,18 +1,36 @@
-diff -ru rpm-3.0.1.old/macros.in rpm-3.0.1/macros.in
---- rpm-3.0.1.old/macros.in    Tue Apr 27 21:46:45 1999
-+++ rpm-3.0.1/macros.in        Fri May  7 03:24:13 1999
-@@ -55,8 +55,8 @@
+diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
+--- rpm-3.0.1.old/configure.in Fri Jun  4 18:21:31 1999
++++ rpm-3.0.1/configure.in     Fri Jun  4 18:22:00 1999
+@@ -781,7 +781,7 @@
+ export LIBS INCPATH
+ 
+ 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.2/macros.in.macros Fri May 14 20:59:43 1999
++++ rpm-3.0.2/macros.in        Tue Jul 20 12:44:52 1999
+@@ -60,12 +60,12 @@
  %_builddir            %{_topdir}/BUILD
  %_buildshell          /bin/sh
  %_bzip2bin            @BZIP2BIN@
 -%_dbpath              %{_var}/lib/rpm
 -%_defaultdocdir               %{_usr}/doc
-+%_dbpath              %{_var}/db/rpm
++%_dbpath              %{_var}/state/rpm
 +%_defaultdocdir               %{_usr}/share/doc
  #
  # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
- %_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
-@@ -69,13 +69,13 @@
+-%_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
+-%_fixgroup            [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
++%_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rf root.@ROOT_GROUP@
++#%_fixgroup           [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
+ %_fixperms            %{__chmod} -Rf @FIXPERMS@
+ #
+ %_gzipbin             @GZIPBIN@
+@@ -74,13 +74,13 @@
  %_rpmdir              %{_topdir}/RPMS
  #
  # XXX Note escaped %% for use in headerSprintf
@@ -28,15 +46,21 @@ diff -ru rpm-3.0.1.old/macros.in rpm-3.0.1/macros.in
  #
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -154,8 +154,8 @@
+@@ -153,14 +153,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}/include
 -%_mandir              %{_prefix}/man
-+%_infodir             %{_prefix}/share/info
++%_infodir             /usr/share/info
 +%_mandir              %{_prefix}/share/man
  
  #==============================================================================
  # ---- config.guess platform macros.
-Only in rpm-3.0.1: macros.in~