we're moving forward to rpm 4.1...

tagged before this commit as before-rpm-4_1

15 files changed, 24 insertions, 21 deletions

diff --git a/anaconda.spec.in b/anaconda.spec.in
index e52d09190..5d0c52121 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -8,9 +8,9 @@ License: GPL
 Summary: The Red Hat Linux installation program.
 Group: Applications/System
 Source: anaconda-%{PACKAGE_VERSION}.tar.bz2
-BuildPreReq: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm404-python, newt-devel, librpm404-devel, gettext >= 0.11, modutils-devel, rhpl, booty, libxml2-python, zlib-devel
+BuildPreReq: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python, newt-devel, rpm-devel, gettext >= 0.11, modutils-devel, rhpl, booty, libxml2-python, zlib-devel
 Prereq: chkconfig /etc/init.d
-Requires: rpm404-python, rhpl
+Requires: rpm-python, rhpl
 Url: http://rhlinux.redhat.com/anaconda/
 
 BuildRoot: %{_tmppath}/anaconda-%{PACKAGE_VERSION}
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 * %{date} Anaconda team <bugzilla@redhat.com>
 - built new version from CVS
 
+* Tue Oct  8 2002 Jeremy Katz <katzj@redhat.com>
+- back to mainstream rpm instead of rpm404
+
 * Mon Sep  9 2002 Jeremy Katz <katzj@redhat.com>
 - can't buildrequire dietlibc and kernel-pcmcia-cs since they don't always
   exist
diff --git a/comps.py b/comps.py
index 20775e13f..5bfff9771 100644
--- a/comps.py
+++ b/comps.py
@@ -16,7 +16,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm404 as rpm
+import rpm
 import os
 from string import *
 import types
diff --git a/exception.py b/exception.py
index 8d31d6b8a..a5ccf6eb2 100644
--- a/exception.py
+++ b/exception.py
@@ -21,7 +21,7 @@ import signal
 import traceback
 import iutil
 import types
-import rpm404 as rpm
+import rpm
 from string import joinfields
 from cPickle import Pickler
 from rhpl.translate import _
diff --git a/findpackageset.py b/findpackageset.py
index 08ead4ea7..84a15f3da 100644
--- a/findpackageset.py
+++ b/findpackageset.py
@@ -1,4 +1,4 @@
-import rpm404 as rpm
+import rpm
 
 def dEBUG(str):
     print str
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 810f1b917..21ad6193a 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -15,7 +15,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm404 as rpm
+import rpm
 import gui
 import string
 import sys
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 8cd3ced85..c5c93a853 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -12,7 +12,7 @@
 #
 
 import string
-import rpm404 as rpm
+import rpm
 import os
 import gui
 import sys
diff --git a/scripts/check-repository.py b/scripts/check-repository.py
index 181b65bb1..4d3b76004 100755
--- a/scripts/check-repository.py
+++ b/scripts/check-repository.py
@@ -33,7 +33,7 @@ sys.path.append('/usr/lib/anaconda')
 
 from comps import ComponentSet, HeaderList
 import os
-import rpm404 as rpm
+import rpm
 
 FILENAME = 1000000
 
diff --git a/scripts/dumphdrlist.py b/scripts/dumphdrlist.py
index 6ca2e6a1d..5e49a8323 100644
--- a/scripts/dumphdrlist.py
+++ b/scripts/dumphdrlist.py
@@ -21,7 +21,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm404 as rpm
+import rpm
 import os
 import sys
 
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 65a22852f..9e65458a5 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -3,7 +3,7 @@
 import sys
 import os
 import os.path
-import rpm404 as rpm
+import rpm
 import string
 
 # set up rpm dependency whiteouts
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 6d4279bbf..15690904a 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -101,8 +101,8 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt libtermcap zlib
 	 ash kon2 e2fsprogs util-linux raidtools popt mount procps rpm
 	 XFree86 Xconfigurator anaconda anaconda-runtime kudzu-devel
 	 kudzu hwdata db3 bzip2 bzip2-libs dosfstools pciutils 
-	 reiserfs-utils parted busybox-anaconda rpm404-python anaconda-help booty
-         hdparm lvm librpm404 rhpl libxml2 libxml2-python rdate"
+	 reiserfs-utils parted busybox-anaconda rpm-python anaconda-help booty
+         hdparm lvm rhpl libxml2 libxml2-python rdate"
 
 if [ $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES libgcc libstdc++"
@@ -133,7 +133,7 @@ PACKAGESGR="anaconda XFree86-libs imlib libpng libtiff libjpeg
            XFree86-ISO8859-9-75dpi-fonts esound audiofile libgnome
            XFree86-100dpi-fonts fonts-ISO8859-2 fonts-ISO8859-9
            XFree86-xfs e2fsprogs fileutils glibc glibc-common rsh less
-           ftp readline gzip popt specspo util-linux rpm librpm404
+           ftp readline gzip popt specspo util-linux rpm 
            open grep net-tools traceroute tar procps textutils sed
            ncurses bash cpio mt-st iputils sh-utils
            XFree86 Xconfigurator gnome-python2 pygtk2 gdk-pixbuf 
@@ -303,9 +303,9 @@ usr/$LIBDIR/libdb1*
 usr/$LIBDIR/libnewt*
 usr/$LIBDIR/libparted*
 usr/$LIBDIR/libpopt*
-usr/$LIBDIR/librpm-*4.0.4.so*
-usr/$LIBDIR/librpmdb*4.0.4.so*
-usr/$LIBDIR/librpmio*4.0.4.so*
+usr/$LIBDIR/librpm-*4.1.so*
+usr/$LIBDIR/librpmdb*4.1.so*
+usr/$LIBDIR/librpmio*4.1.so*
 usr/$LIBDIR/libslang*
 usr/$LIBDIR/libstdc++*
 usr/$LIBDIR/libxml2.so*
diff --git a/textw/packages_text.py b/textw/packages_text.py
index f3f254968..f1cd40e86 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -11,7 +11,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm404 as rpm
+import rpm
 from snack import *
 from constants_text import *
 from rhpl.translate import _
diff --git a/textw/progress_text.py b/textw/progress_text.py
index dbad2a324..3a998096d 100644
--- a/textw/progress_text.py
+++ b/textw/progress_text.py
@@ -11,7 +11,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm404 as rpm
+import rpm
 from constants import *
 from snack import *
 from constants_text import *
diff --git a/upgrade.py b/upgrade.py
index 7a373b574..39810d183 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -17,7 +17,7 @@ import isys
 import os
 import iutil
 import time
-import rpm404 as rpm
+import rpm
 import sys
 import os.path
 import partedUtils
diff --git a/urlinstall.py b/urlinstall.py
index 15829204b..ce5d6db4e 100644
--- a/urlinstall.py
+++ b/urlinstall.py
@@ -16,7 +16,7 @@
 from comps import ComponentSet, HeaderList
 from installmethod import InstallMethod
 import os
-import rpm404 as rpm
+import rpm
 import time
 import urllib
 import string
diff --git a/whiteout.py b/whiteout.py
index ae28450d6..91b257fd7 100644
--- a/whiteout.py
+++ b/whiteout.py
@@ -4,7 +4,7 @@
 # Copyright 2002  Red Hat, Inc.
 #
 
-import rpm404 as rpm
+import rpm
 
 whiteout="""
 	pango-gtkbeta-devel>pango-gtkbeta\