- updated to 2.93

Changed files:
    rpm-macros.patch -> 1.2.2.1
    rpm-rpmrc.patch -> 1.2.4.1

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 799bbbef3e02cea9627c9f926f07fbf940bdb7c7..e15fffa493321aef95d189dd382bfad0c2fa5f57 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,35 +1,27 @@
---- rpm-2.92/macros.in.old     Sun Mar 14 01:34:58 1999
-+++ rpm-2.92/macros.in Sun Mar 28 17:18:20 1999
-@@ -38,19 +38,19 @@
- #     These are the default values that will be overridden by any
- #     explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
+--- 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 @@
+ %_rpmdir              %{_topdir}/RPMS
  #
--%_builddir            %{_topdir}/BUILD
--%_bzip2bin            @BZIP2BIN@
--%_dbpath              %{_var}/lib/rpm
--%_defaultdocdir               /usr/doc
--%_fixperms            @FIXPERMS@
--%_gzipbin             @GZIPBIN@
--%_rpmdir              %{_topdir}/RPMS
--%_rpmfilename         %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
--%_sourcedir           %{_topdir}/SOURCES
--%_specdir             %{_topdir}/SPECS
--%_srcrpmdir           %{_topdir}/SRPMS
--%_tmppath             %{_var}/tmp
+ # 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
-+#%_builddir           %{_topdir}/BUILD
-+#%_bzip2bin           @BZIP2BIN@
-+#%_dbpath             %{_var}/lib/rpm
-+#%_defaultdocdir              /usr/doc
-+#%_fixperms           @FIXPERMS@
-+#%_gzipbin            @GZIPBIN@
-+#%_rpmdir             %{_topdir}/RPMS
-+#%_rpmfilename                %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
-+#%_sourcedir          %{_topdir}/SOURCES
-+#%_specdir            %{_topdir}/SPECS
-+#%_srcrpmdir          %{_topdir}/SRPMS
-+#%_tmppath            %{_var}/tmp
-+#%_topdir             %{_usrsrc}/redhat
++%_topdir              %(echo $HOME)/rpm
+ #
+ #==============================================================================
+ # ---- Optional rpmrc macros.
+@@ -96,7 +96,7 @@
+ #%_pgp_path
+ #%_provides
+ #%_timecheck
+-#%vendor
++%vendor                       PLD
  
  #==============================================================================
  # ---- per-platform macros.

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 94335ae10e72dbcbb965eb939de74e25d4983cb1..157fa7ed6c39581039ce6dfb881e3a82be633fad 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,25 +1,27 @@
-diff -Nur rpm-2.5.6/lib-rpmrc.in rpm-2.5.6.pld/lib-rpmrc.in
---- rpm-2.5.6/lib-rpmrc.in     Fri Feb  5 09:59:38 1999
-+++ rpm-2.5.6.pld/lib-rpmrc.in Fri Feb  5 09:57:57 1999
-@@ -12,17 +12,20 @@
- bzip2bin:     @BZIP2BIN@
- defaultdocdir:  @prefix@/doc
- fixperms:     @FIXPERMS@
-+Vendor:               PLD
- rpmfilename:    %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
- instchangelog:        5
- 
- #############################################################
+--- rpm-2.93/rpmrc.in.rpmrc    Sun Apr  4 22:10:34 1999
++++ rpm-2.93/rpmrc.in  Thu Apr  8 18:32:21 1999
+@@ -4,10 +4,15 @@
  
  # Please send new entries to rpm-list@redhat.com
-+ 
-+# Plesae send new entries to pld-list@mailbox.tuniv.szczecin.pl
  
++# Plesae send new entries to pld-list@pld.org.pl
++
  #############################################################
  # Values for RPM_OPT_FLAGS for various platforms
  
 -optflags: i386 -O2 -m486 -fno-strength-reduce
-+optflags: i386 -O2 -mpentium -fomit-frame-pointer
++optflags: i386 -O2
++optflags: i486 -O2
++optflags: i586 -O2 -mpentium
++optflags: i686 -O2 -mpentium
  optflags: alpha -O2
  optflags: sparc -O2
  optflags: sparc64 -O2
+@@ -187,6 +192,6 @@
+ #############################################################
+ #macrofiles:  @RPMCONFIGDIR@/macros:@SYSCONFIGDIR@/macros:~/.rpmmacros
+ 
+-macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
++macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@RPMCONFIGDIR@/macros.pld:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
+ 
+ #include: @RPMCONFIGDIR@/%{_target}/rpmrc