- fixed generating requirements for shell scripts

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index bceb746795484b0efe84096be69ecd4a442b2c8f..e2cc22589784be84b6ab7abc27d9bd6e48f403db 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,18 +1,39 @@
-diff -Nur rpm-3.0.1/macros.in rpm-3.0.1.pld/macros.in
---- rpm-3.0.1/macros.in        Tue May 11 11:24:08 1999
-+++ rpm-3.0.1.pld/macros.in    Mon May 17 20:07:52 1999
-@@ -55,8 +55,8 @@
+--- 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}/db/rpm
++%_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} -Rf root
-@@ -69,13 +69,13 @@
+-%_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
@@ -28,20 +49,18 @@ diff -Nur rpm-3.0.1/macros.in rpm-3.0.1.pld/macros.in
  #
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -107,7 +107,7 @@
- #     will be used if the per-platform macro file does not exist..
- #
- %_arch                        @RPMCANONARCH@
--%_vendor              @RPMCANONVENDOR@
-+%_vendor              pld
- %_os                  @RPMCANONOS@
- %_target_platform     %{_target_cpu}-%{_vendor}-%{_target_os}
- #
-@@ -154,8 +154,8 @@
+@@ -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}/include
+-%_infodir             %{_prefix}/info
 -%_mandir              %{_prefix}/man
 +%_infodir             %{_prefix}/share/info
 +%_mandir              %{_prefix}/share/man