Drop the libmpc-mpfr3 and libmpc-mpfr3-devel subpackages.

libmpc.spec

@@ -5,7 +5,7 @@
 Summary: C library for multiple precision complex arithmetic
 Name: libmpc
 Version: 1.1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv3+
 URL: http://www.multiprecision.org/mpc/
 Source0: https://ftp.gnu.org/gnu/mpc/mpc-%{version}.tar.gz
@@ -16,7 +16,10 @@ Source1: https://ftp.gnu.org/gnu/mpc/mpc-%{bootstrap_version}.tar.gz
 BuildRequires: gcc
 BuildRequires: gmp-devel >= 5.0.0
 BuildRequires: mpfr-devel
-BuildRequires: mpfr3-devel
+
+# This can be removed before the next build
+Obsoletes: libmpc-mpfr3 < 1.1.0-7
+Provides: libmpc-mpfr3 = %{version}-%{release}
 
 %if 0%{?bootstrap} == 0
 Obsoletes: compat-libmpc < %{version}-1
@@ -34,6 +37,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: gmp-devel%{?_isa}
 Requires: mpfr-devel%{?_isa}
 
+# This can be removed before the next build
+Obsoletes: libmpc-mpfr3-devel < 1.1.0-7
+Provides: libmpc-mpfr3-devel = %{version}-%{release}
+
 %description devel
 Header files and shared library symlinks for the MPC library.
 
@@ -45,29 +52,6 @@ BuildArch: noarch
 %description doc
 Documentation for the MPC library.
 
-%package mpfr3
-Summary: C library for multiple-precision complex arithmetic (MPFR 3)
-
-%description mpfr3
-MPC is a C library for the arithmetic of complex numbers with arbitrarily
-high precision and correct rounding of the result.  It is built upon and
-follows the same principles as Mpfr.
-
-This is the same as the libmpc package, except this package is linked
-with MPFR 3.  The libmpc package is linked with MPFR 4.
-
-%package mpfr3-devel
-Summary: Headers and shared development libraries for MPC (MPFR 3)
-Requires: %{name}-mpfr3%{?_isa} = %{version}-%{release}
-Requires: gmp-devel%{?_isa}
-Requires: mpfr3-devel%{?_isa}
-
-%description mpfr3-devel
-Header files and shared library symlinks for the MPC library.
-
-This is the same as the libmpc-devel package, except this package is for
-use with MPFR 3.  The libmpc-devel package is for use with MPFR 4.
-
 %if 0%{?bootstrap}
 %package -n compat-libmpc
 Summary: compat/bootstrap mpc-%{bootstrap_version} library
@@ -77,22 +61,11 @@ Contains the .so files for mpc version %{bootstrap-version}.
 %endif
 
 %prep
+%setup -q -n mpc-%{version}
 %if 0%{?bootstrap}
 %setup -q -n mpc-%{version} -a 1
-%else
-%setup -q -n mpc-%{version}
-%setup -q -T -D -a 0 -n mpc-%{version}
 %endif
 
-# Prepare the mpfr3 build so it does not collide with the main package
-mv mpc-%{version} mpc-%{version}-mpfr3
-cd mpc-%{version}-mpfr3
-sed -i 's/-lmpfr/&3/g;s/mpfr\.h/mpfr3.h/g' configure src/mpc{,-impl}.h
-sed -e 's/libmpc_la/libmpc_mpfr3_la/g' \
-    -e 's/libmpc\.la/libmpc-mpfr3.la/'g \
-    -i {src,tests}/Makefile.in
-cd -
-
 %build
 %configure --disable-static
 
@@ -116,19 +89,6 @@ pushd mpc-%{bootstrap_version}
 popd
 %endif
 
-cd mpc-%{version}-mpfr3
-%configure --disable-static
-
-# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
-# -Wl,--as-needed after all the libraries.
-sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-    -e 's|CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \
-    -i libtool
-
-%make_build
-cd -
-
 %install
 %if 0%{?bootstrap}
 %make_install -C mpc-%{bootstrap_version}
@@ -139,12 +99,6 @@ rm -fv %{buildroot}%{_includedir}/*
 rm -fv %{buildroot}%{_infodir}/*
 %endif
 
-cd mpc-%{version}-mpfr3
-%make_install
-rm -fr %{buildroot}/%{_infodir}
-mv %{buildroot}%{_includedir}/mpc.h %{buildroot}%{_includedir}/mpc-mpfr3.h
-cd -
-
 %make_install
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_infodir}/dir
@@ -152,9 +106,6 @@ rm -f %{buildroot}/%{_infodir}/dir
 %check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 make check
-cd mpc-%{version}-mpfr3
-make check
-cd -
 
 %files
 %license COPYING.LESSER
@@ -169,21 +120,15 @@ cd -
 %doc AUTHORS
 %{_infodir}/*.info*
 
-%files mpfr3
-%license mpc-%{version}-mpfr3/COPYING.LESSER
-%doc mpc-%{version}-mpfr3/NEWS mpc-%{version}-mpfr3/README
-%{_libdir}/libmpc-mpfr3.so.3*
-
-%files mpfr3-devel
-%{_libdir}/libmpc-mpfr3.so
-%{_includedir}/mpc-mpfr3.h
-
 %if 0%{?bootstrap}
 %files -n compat-libmpc
 %{_libdir}/libmpc.so.2*
 %endif
 
 %changelog
+* Fri Oct 11 2019 Jerry James <loganjerry@gmail.com> - 1.1.0-7
+- Drop the libmpc-mpfr3 and libmpc-mpfr3-devel subpackages
+
 * Wed Oct  9 2019 Jerry James <loganjerry@gmail.com> - 1.1.0-6
 - Build the main package against mpfr4