- reprise file conflicts yet again, flip/flop/flip/flop ... flip?

This commit is contained in:
jbj 2004-10-31 02:03:15 +00:00
parent 5cf117d3de
commit cfa9d597cb
2 changed files with 7 additions and 4 deletions

View File

@ -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

View File

@ -1 +1 @@
2e3e04292a92cf5a1ae021020b03fbac rpm-4.3.2.tar.gz
a3872154e86f43797aa022d25634326f rpm-4.3.2.tar.gz