- upgraded to 3.0.3

Changed files:
    rpm-arch.patch -> 1.3
    rpm-install-tree -> 1.3
    rpm-macros.patch -> 1.11
    rpm-rpmpopt.patch -> 1.2

diff --git a/rpm-arch.patch b/rpm-arch.patch
index b18c11b6ecd769bf041154148c03776ff1a7828e..8c460e5dcb36590c73164e92edb050a1bff8d442 100644 (file)
--- a/rpm-arch.patch
+++ b/rpm-arch.patch
@@ -1,7 +1,6 @@
-diff -ru rpm-3.0.2.old/rpmrc.in rpm-3.0.2/rpmrc.in
---- rpm-3.0.2.old/rpmrc.in     Thu Sep  9 22:08:24 1999
-+++ rpm-3.0.2/rpmrc.in Thu Sep  9 22:11:31 1999
-@@ -118,12 +118,12 @@
+--- rpm-3.0.3/rpmrc.in.wiget   Tue Oct 19 16:43:30 1999
++++ rpm-3.0.3/rpmrc.in Tue Oct 19 16:49:17 1999
+@@ -120,12 +120,12 @@
  buildarchtranslate: osfmach3_i486: i386
  buildarchtranslate: osfmach3_i386: i386
  
@@ -20,10 +19,10 @@ diff -ru rpm-3.0.2.old/rpmrc.in rpm-3.0.2/rpmrc.in
  buildarchtranslate: i386: i386
  
  buildarchtranslate: osfmach3_ppc: ppc
-@@ -133,7 +133,8 @@
- buildarchtranslate: sun4c: sparc
+@@ -136,7 +136,8 @@
  buildarchtranslate: sun4d: sparc
  buildarchtranslate: sun4m: sparc
+ buildarchtranslate: sparcv9: sparc
 -buildarchtranslate: sun4u: sparc64
 +buildarchtranslate: sun4u: sparc
 +buildarchtranslate: sparc64: sparc

diff --git a/rpm-install-tree b/rpm-install-tree
index ef05d51fe501db5078d1b3b705a916b0e15fd5fa..02323811257092b9987f05a2676883a4ef846908 100644 (file)
--- a/rpm-install-tree
+++ b/rpm-install-tree
@@ -1,18 +1,3 @@
 #!/bin/sh
 
-DUMB_SPEC_FILE=`mktemp -q ${TMPDIR:-/tmp}/bilder.XXXXXX || ( echo "mktemp falied." ; exit 1)`
-echo "\
-Summary:        -
-Name:           dumb
-Version:        dumb
-Release:        dumb
-Copyright:      dumb
-Group:          -
-%description
-
-%prep
-install -d %{_rpmdir}  %{_specdir} %{_sourcedir} %{_srcrpmdir}  %{_builddir}
-" > $DUMB_SPEC_FILE
-rpm -bp $DUMB_SPEC_FILE >/dev/null 2>&1 
-rm -f $DUMB_SPEC_FILE
-                           
+install -d `rpm --eval "%{_rpmdir}  %{_specdir} %{_sourcedir} %{_srcrpmdir}  %{_builddir}"`

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 4fc43638c85839b46ed609717c4b5da70c1c13ca..04f0fa6dacad894bc991833dcdd44c8dfaeab47e 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,19 +1,17 @@
-diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
---- rpm-3.0.1.old/configure.in Fri Jun  4 18:21:31 1999
-+++ rpm-3.0.1/configure.in     Fri Jun  4 18:22:00 1999
-@@ -781,7 +781,7 @@
- export LIBS INCPATH
+--- rpm-3.0.3/configure.in.wiget       Thu Sep 30 23:25:29 1999
++++ rpm-3.0.3/configure.in     Tue Oct 19 16:33:48 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.2/macros.in.macros Fri May 14 20:59:43 1999
-+++ rpm-3.0.2/macros.in        Tue Jul 20 12:44:52 1999
-@@ -60,12 +60,12 @@
+       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        Tue Oct 19 16:38:08 1999
+@@ -60,8 +60,8 @@
  %_builddir            %{_topdir}/BUILD
  %_buildshell          /bin/sh
  %_bzip2bin            @BZIP2BIN@
@@ -21,16 +19,21 @@ diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
 -%_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} -Rf root
--%_fixgroup            [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
-+%_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rf root.@ROOT_GROUP@
-+#%_fixgroup           [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
+-%_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@
-@@ -74,13 +74,13 @@
+@@ -80,13 +80,13 @@
  %_rpmdir              %{_topdir}/RPMS
  #
  # XXX Note escaped %% for use in headerSprintf
@@ -46,7 +49,7 @@ diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
  #
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -153,14 +153,14 @@
+@@ -160,14 +160,14 @@
  %_sbindir             %{_exec_prefix}/sbin
  %_libexecdir          %{_exec_prefix}/libexec
  %_datadir             %{_prefix}/share
@@ -57,9 +60,8 @@ diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
  %_libdir              %{_exec_prefix}/lib
  %_includedir          %{_prefix}/include
  %_oldincludedir               /usr/include
--%_infodir             %{_prefix}/include
+ %_infodir             %{_prefix}/info
 -%_mandir              %{_prefix}/man
-+%_infodir             /usr/share/info
 +%_mandir              %{_prefix}/share/man
  
  #==============================================================================

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 40911e4d6232fd29a0cda933943222abe9f0f582..9be392b4661b56f7474a4af1ba52310c58f47ac7 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,8 +1,8 @@
-diff -ru rpm-3.0.2.old/rpmpopt rpm-3.0.2/rpmpopt
---- rpm-3.0.2.old/rpmpopt      Fri Jun 18 16:32:25 1999
-+++ rpm-3.0.2/rpmpopt  Tue Jul 20 13:09:55 1999
-@@ -66,3 +66,4 @@
- rpm alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]'
- rpm exec --freshen freshen.sh
- rpm alias -F --freshen
+--- rpm-3.0.3/rpmpopt.wiget    Fri Sep 24 03:50:04 1999
++++ rpm-3.0.3/rpmpopt  Tue Oct 19 16:56:16 1999
+@@ -72,3 +72,5 @@
+ 
+ rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides
+ rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires
++
 +rpm exec --install-build-tree install-build-tree