From b86d6bd351f882b20190286fed8dfa82547fdf73 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 12:47:05 +0000
Subject: auto-import changelog data from rpm-4.3.2-0.5.src.rpm

Mon Jul 05 2004 Jeff Johnson <jbj@jbj.org> 4.3.2-0.5
- change default behavior to resolve file conflicts as LIFO.
- add --fileconflicts to recover rpm traditional behavior.
- prefer elf64 over elf32 files, everywhere and always (#126853).
- ia64: auto-relocate entire, not partial, directory contents (#126905).
- ia64: auto-relocate glibc.ix86 interpreter path (#100563).

---

diff --git a/rpm.spec b/rpm.spec
index 09ebf31..5d094bd 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: 0.4
+Release: 0.5
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -485,6 +485,13 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Mon Jul  5 2004 Jeff Johnson <jbj@jbj.org> 4.3.2-0.5
+- change default behavior to resolve file conflicts as LIFO.
+- add --fileconflicts to recover rpm traditional behavior.
+- prefer elf64 over elf32 files, everywhere and always (#126853).
+- ia64: auto-relocate entire, not partial, directory contents (#126905).
+- ia64: auto-relocate glibc.ix86 interpreter path (#100563).
+
 * Wed Jun 16 2004 Jeff Johnson <jbj@jbj.org> 4.3.2-0.4
 - add ppc8[25]60 arches.
 
diff --git a/sources b/sources
index 7aab5a6..7905072 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-803a48129f9bae70513634f443ee5178  rpm-4.3.2.tar.gz
+e759eac3fc14351ba2a8c78cb76b3981  rpm-4.3.2.tar.gz