From cfa9d597cb5b1c4d5fe3c6ec29e9d3086c414be1 Mon Sep 17 00:00:00 2001
From: jbj <jbj@fedoraproject.org>
Date: Oct 31 2004 02:03:15 +0000
Subject: - reprise file conflicts yet again, flip/flop/flip/flop ... flip?


---

diff --git a/rpm.spec b/rpm.spec
index a00501e..c4e3b7a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ Name: rpm
 %define version 4.3.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 17
+Release: 16
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -494,11 +494,14 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
-* Fri Oct 29 2004 Jeff Johnson <jbj@redhat.com> rpm-4.2.3-17
+* Sat Oct 30 2004 Jeff Johnson <jbj@redhat.com> 4.3.2-18
+- reprise file conflicts yet again, flip/flop/flip/flop ... flip?
+
+* Fri Oct 29 2004 Jeff Johnson <jbj@redhat.com> 4.2.3-16
 - python: fix RPMPROB_BADRELOCATE segfault return in ts.check (#137116).
 - revert selinux patch until fc3 release.
 
-* Fri Oct 22 2004 Jeff Johnson <jbj@redhat.com> rpm-4.3.2-15
+* Fri Oct 22 2004 Jeff Johnson <jbj@redhat.com> 4.3.2-15
 - selinux: set "ldconfig_t" for /sbin/ldconfig, else "rpm_script_t".
 
 * Sun Oct 17 2004 Jeff Johnson <jbj@jbj.org> 4.3.2-14
diff --git a/sources b/sources
index e4a1133..5768796 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e3e04292a92cf5a1ae021020b03fbac  rpm-4.3.2.tar.gz
+a3872154e86f43797aa022d25634326f  rpm-4.3.2.tar.gz