- Remove compat-librpm3 hack

rpm.spec

@@ -29,7 +29,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}2%{?dist}
+Release: %{?snapver:0.%{snapver}.}3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@@ -155,22 +155,12 @@ Requires: libcap%{_isa} >= 2.16
 %if %{with plugins}
 Requires: rpm-plugin-selinux%{_isa} = %{version}-%{release}
 %endif
+# Remove temporary compat-librpm3 package from F23
+Obsoletes: compat-librpm3 < %{version}-%{release}
 
 %description libs
 This package contains the RPM shared libraries.
 
-%package -n compat-librpm3
-Summary: Compat package with RPM libraries
-Group: Development/Libraries
-License: GPLv2+ and LGPLv2+ with exceptions
-Requires: rpm = %{version}-%{release}
-# Explicitly conflict with older rpm-libs that ship libraries
-# with the same soname as this compat package
-Conflicts: rpm-libs < 4.12.90
-
-%description -n compat-librpm3
-Compatibility package with RPM libraries ABI version 3.
-
 %package build-libs
 Summary:  Libraries for building and signing RPM packages
 Group: Development/Libraries
@@ -399,11 +389,6 @@ do
 done
 %endif
 
-# Install compatibility libraries
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-cp -a %{_libdir}/librpmio.so.3* $RPM_BUILD_ROOT%{_libdir}
-cp -a %{_libdir}/librpm.so.3* $RPM_BUILD_ROOT%{_libdir}
-
 %find_lang %{name}
 
 find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
@@ -485,15 +470,11 @@ exit 0
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/librpmio.so.7*
-%{_libdir}/librpm.so.7*
+%{_libdir}/librpmio.so.*
+%{_libdir}/librpm.so.*
 %if %{with plugins}
 %dir %{_libdir}/rpm-plugins
 
-%files -n compat-librpm3
-%{_libdir}/librpmio.so.3*
-%{_libdir}/librpm.so.3*
-
 %files plugin-syslog
 %{_libdir}/rpm-plugins/syslog.so
 
@@ -573,6 +554,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+
+* Mon Sep 07 2015 Florian Festi <ffesti@rpm.org> - 4.4.13.0-0.rc1.3
+- Remove compat-librpm3 hack
+
 * Sat Sep 05 2015 Kalev Lember <klember@redhat.com> - 4.13.0-0.rc1.2
 - Add a temporary compat-librpm3 subpackage