This commit was manufactured by cvs2git to create branch 'rpm3'.

Sprout from rpm-2_9x 1999-03-28 17:45:21 UTC Artur Frysiak <artur@frysiak.net> 'permision to /var/lib/rpm must be 755'
Cherrypick from rpm-2_9x 1999-03-10 06:39:47 UTC cvs2git <feedback@pld-linux.org> 'This commit was manufactured by cvs2git to create branch 'rpm-2_9x'.':
    rpm-rpmrc.patch -> 1.2
Cherrypick from master 1999-04-08 14:20:31 UTC Artur Frysiak <artur@frysiak.net> 'rpm macros patch':
    rpm-macros.patch -> 1.2

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 8396de2ca0fc411d887ee5c58f7c4da38f566d5c..94335ae10e72dbcbb965eb939de74e25d4983cb1 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,34 +1,25 @@
---- rpm-2.92/rpmrc.in.old      Sun Mar 14 01:35:00 1999
-+++ rpm-2.92/rpmrc.in  Sat Mar 27 16:41:42 1999
-@@ -7,23 +7,28 @@
- # whenever a new version of RPM is installed.
- 
- dbpath:               @varprefix@/lib/rpm
--topdir:               @prefix@/src/redhat
-+topdir:               @prefix@/src/rpm
- tmppath:      @tmpdir@
- gzipbin:      @GZIPBIN@
+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@
--rpmfilename:    %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
-+Vendor:         PLD          
-+rpmfilename:    %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
-+macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/macros.pld
++Vendor:               PLD
+ rpmfilename:    %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
  instchangelog:        5
  
  #############################################################
  
  # 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
-+optflags: i686 -O2 -mpentium
++optflags: i386 -O2 -mpentium -fomit-frame-pointer
  optflags: alpha -O2
  optflags: sparc -O2
  optflags: sparc64 -O2