- fixed generating requirements for shell scripts

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index e15fffa493321aef95d189dd382bfad0c2fa5f57..e2cc22589784be84b6ab7abc27d9bd6e48f403db 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,6 +1,39 @@
---- rpm-2.93/macros.in.macros  Thu Apr  8 17:51:13 1999
-+++ rpm-2.93/macros.in Thu Apr  8 18:02:34 1999
-@@ -66,13 +66,13 @@
+--- 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
+ #
+ %__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
@@ -16,12 +49,21 @@
  #
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -96,7 +96,7 @@
- #%_pgp_path
- #%_provides
- #%_timecheck
--#%vendor
-+%vendor                       PLD
+@@ -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
  
  #==============================================================================
- # ---- per-platform macros.
+ # ---- config.guess platform macros.