Revert "Build and ship also Python 2 modules for hp-plugin (bug #1196237)."

This reverts commit 8b7f3bae70.

hplip.spec

@@ -1,16 +1,13 @@
 # we don't want to provide private python extension libs
 %{?filter_setup:
-%filter_provides_in %{python2_sitearch}/.*\.so$
 %filter_provides_in %{python3_sitearch}/.*\.so$
 %filter_setup
 }
 
-%{!?py2dir: %global py2dir python2-%{name}-%{version}-%{release}}
-
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.15.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -42,8 +39,6 @@ Patch23: hplip-silence-ioerror.patch
 Patch24: hplip-CommonDefinations.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# due to hp-plugin (BZ#1196237)
-Requires: %{name}-compat-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
 Requires: cups
 Requires: wget
@@ -88,22 +83,11 @@ Summary: HPLIP libraries
 License: GPLv2+ and MIT
 Requires: %{name}-common%{?_isa} = %{version}-%{release}
 Requires: python3
+Obsoletes: %{name}-compat-libs < %{version}-%{release}
 
 %description libs
 Libraries needed by HPLIP.
 
-%package compat-libs
-Summary: HPLIP Python 2 modules
-License: GPLv2+ and MIT
-Requires: %{name}-common%{?_isa} = %{version}-%{release}
-Requires: python-pillow
-Requires: dbus-python
-Requires: python
-BuildRequires: python2-devel
-
-%description compat-libs
-Python 2 modules needed by HP plugin.
-
 %package gui
 Summary: HPLIP graphical tools
 License: BSD
@@ -236,20 +220,7 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
     prnt/filters/hpps \
     fax/filters/pstotiff
 
-# compat-libs
-rm -rf ../%{py2dir}
-cp -a . ../%{py2dir}
-
-
 %build
-# compat-libs
-pushd ../%{py2dir}
-%configure PYTHON=%{__python2}
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make libhpmud.la hpmudext.la libhpipp.la cupsext.la pcardext.la scanext.la
-popd
-
 %configure \
         --enable-scan-build --enable-gui-build --enable-fax-build \
         --disable-foomatic-rip-hplip-install --enable-pp-build \
@@ -264,18 +235,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make
 
 %install
-# compat-libs
-pushd ../%{py2dir}
-make install-libLTLIBRARIES \
-     install-hpmudextLTLIBRARIES \
-     install-cupsextLTLIBRARIES \
-     install-pcardextLTLIBRARIES \
-     install-scanextLTLIBRARIES \
-     DESTDIR=%{buildroot} PYTHON=%{__python2}
-rm -f %{buildroot}%{python2_sitearch}/*.la
-popd
-
-
 mkdir -p %{buildroot}%{_bindir}
 make install DESTDIR=%{buildroot} PYTHON=%{__python3}
 
@@ -466,10 +425,6 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 # Python extension
 %{python3_sitearch}/*
 
-%files compat-libs
-# Python extensions
-%{python2_sitearch}/*.so
-
 %files gui
 %{_bindir}/hp-check
 %{_bindir}/hp-print
@@ -497,6 +452,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Aug 18 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-5
+- remove compat-libs subpackage (bug #1196237).
+
 * Tue Aug 11 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-4
 - Upstream fix for 'Stopped "Filter Failed"' (Launchpad #1476920)