Changes from rpm-4_3 branch.

CVS patchset: 7442
CVS date: 2004/10/09 20:39:27

diff --git a/CHANGES b/CHANGES
index f8149ce..b45e5b6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,19 @@
        - add ppc8[25]60 arches.
        - fix: evaluate rather than default file_contexts path. (#127501).
        - avoid "can't happen" recursion while retrieving pubkeys.
+       - add ppc32dy4 arch.
+       - make peace with automake 1.9.1.
+       - fix: defattr for rpm-libs (#130461).
+       - print dependency loops as warning iff --anaconda is specified.
+       - fix: mark uninstalled elf32 files in rpmdb to disable -Va checks.
+       - ia64: add autorelocate_dcolor to macros.in.
+       - disable static linking until libc*.a provides symbols.
+       - fix: revert Obsoletes: "fix" (#134497).
+       - fix: work around for dangling symlinks not globbed (#134362).
+       - display caught signals to diagnose #134474 (gonna be SIGPIPE).
+       - display N-V-R.A in dependency failure messages.
+       - selinux: set "rpm_script_t" always, not just for /bin/sh.
+       - honor inherited SIG_IGN when establishing rpmdb signal exit (#134474).
 
 4.3 -> 4.3.1:
        - fix: don't add leading space to %* argv expansion (#119059).

diff --git a/rpm.spec.in b/rpm.spec.in
index 4b710b7..281f577 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -57,10 +57,17 @@ verifying, querying, and updating software packages. Each software
 package consists of an archive of files along with information about
 the package like its version, a description, etc.
 
+%package libs
+Summary:  Libraries for manipulating RPM packages.
+Group: Development/Libraries
+
+%description libs
+This package contains the RPM shared libraries.
+
 %package devel
 Summary:  Development files for manipulating RPM packages.
 Group: Development/Libraries
-Requires: rpm = %{rpm_version}
+Requires: rpm = %{rpm_version}-%{release}
 
 %description devel
 This package contains the RPM C library and header files. These
@@ -76,7 +83,7 @@ will manipulate RPM packages and databases.
 %package build
 Summary: Scripts and executable programs used to build packages.
 Group: Development/Tools
-Requires: rpm = %{rpm_version}, patch >= 2.5, file
+Requires: rpm = %{rpm_version}-%{release}, patch >= 2.5, file
 Provides: rpmbuild(VendorConfig) = 4.1-1
 
 %description build
@@ -87,7 +94,7 @@ that are used to build packages using the RPM Package Manager.
 %package python
 Summary: Python bindings for apps which will manipulate RPM packages.
 Group: Development/Libraries
-Requires: rpm = %{rpm_version}
+Requires: rpm = %{rpm_version}-%{release}
 Requires: python >= %{with_python_version}
 Requires: elfutils >= 0.55
 
@@ -280,11 +287,6 @@ exit 0
 %rpmattr       %{__bindir}/rpmquery
 %rpmattr       %{__bindir}/rpmverify
 
-%{__libdir}/librpm-@VERSION@.so
-%{__libdir}/librpmdb-@VERSION@.so
-%{__libdir}/librpmio-@VERSION@.so
-%{__libdir}/librpmbuild-@VERSION@.so
-
 %attr(0755, @RPMUSER@, @RPMGROUP@)     %dir %{__prefix}/lib/rpm
 %rpmattr       %{__prefix}/lib/rpm/config.guess
 %rpmattr       %{__prefix}/lib/rpm/config.sub
@@ -366,6 +368,13 @@ exit 0
 %lang(ru)      %{__mandir}/ru/man[18]/*.[18]*
 %lang(sk)      %{__mandir}/sk/man[18]/*.[18]*
 
+%files libs
+%defattr(-,root,root)
+%{__libdir}/librpm-4.3.so
+%{__libdir}/librpmdb-4.3.so
+%{__libdir}/librpmio-4.3.so
+%{__libdir}/librpmbuild-4.3.so
+
 %files build
 %defattr(-,root,root)
 %dir %{__prefix}/src/@RPMCANONVENDOR@