-- fixed %{_vendor} to "pld", for correct use of %{_target_platform} macro

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index e15fffa493321aef95d189dd382bfad0c2fa5f57..bceb746795484b0efe84096be69ecd4a442b2c8f 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,6 +1,18 @@
---- 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 @@
+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 @@
+ %_builddir            %{_topdir}/BUILD
+ %_buildshell          /bin/sh
+ %_bzip2bin            @BZIP2BIN@
+-%_dbpath              %{_var}/lib/rpm
+-%_defaultdocdir               %{_usr}/doc
++%_dbpath              %{_var}/db/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 @@
  %_rpmdir              %{_topdir}/RPMS
  #
  # XXX Note escaped %% for use in headerSprintf
@@ -16,12 +28,23 @@
  #
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -96,7 +96,7 @@
- #%_pgp_path
- #%_provides
- #%_timecheck
--#%vendor
-+%vendor                       PLD
+@@ -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 @@
+ %_libdir              %{_exec_prefix}/lib
+ %_includedir          %{_prefix}/include
+ %_oldincludedir               /usr/include
+-%_infodir             %{_prefix}/include
+-%_mandir              %{_prefix}/man
++%_infodir             %{_prefix}/share/info
++%_mandir              %{_prefix}/share/man
  
  #==============================================================================
- # ---- per-platform macros.
+ # ---- config.guess platform macros.