Merge branch 'f23'

python-cups.spec

@@ -6,15 +6,19 @@
 Summary:       Python bindings for CUPS
 Name:          python-cups
 Version:       1.9.72
-Release:       4%{?dist}
+Release:       5%{?dist}
 URL:           http://cyberelk.net/tim/software/pycups/
 Source:        http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2
 License:       GPLv2+
-Group:         Development/Languages
 BuildRequires: cups-devel
 BuildRequires: python2-devel python3-devel
 BuildRequires: epydoc
 
+# defined in /usr/lib/rpm/macros.d/macros.python
+# if python_provide() is defined, call python_provide(python-cups)
+# which may eventually add Provides: ... (see the function definition)
+%{?python_provide:%python_provide python-cups}
+
 %description
 This package provides Python bindings for CUPS API,
 known as pycups. It was written for use with
@@ -22,7 +26,7 @@ system-config-printer, but can be put to other uses as well.
 
 %package -n python3-cups
 Summary:       Python3 bindings for CUPS API, known as pycups.
-Group:         Development/Languages
+%{?python_provide:%python_provide python3-cups}
 
 %description -n python3-cups
 This package provides Python bindings for CUPS API,
@@ -33,34 +37,24 @@ This is a ported release for python 3
 
 %package doc
 Summary:       Documentation for python-cups
-Group:         Documentation
 
 %description doc
 Documentation for python-cups.
 
 %prep
-%setup -q -n pycups-%{version}
+%setup -n pycups-%{version}
-
-rm -rf %{py3dir}
-cp -a . %{py3dir}
 
 %build
-make CFLAGS="%{optflags} -fno-strict-aliasing"
 make doc
-
+%py2_build
-pushd %{py3dir}
 %py3_build
-popd
 
 
 %install
-make install DESTDIR="%{buildroot}"
+make install-rpmhook DESTDIR="%{buildroot}"
-
+%py2_install
-pushd %{py3dir}
 %py3_install
 chmod 755 %{buildroot}%{python3_sitearch}/cups*.so
-popd
-
 
 
 %files
@@ -69,7 +63,7 @@ popd
 %{python_sitearch}/pycups*.egg-info
 
 %files -n python3-cups
-%doc COPYING README NEWS
+%doc COPYING README NEWS TODO
 %{python3_sitearch}/cups.cpython-3*.so
 %{python3_sitearch}/pycups*.egg-info
 %{_rpmconfigdir}/fileattrs/psdriver.attr
@@ -79,6 +73,10 @@ popd
 %doc examples html
 
 %changelog
+* Fri Nov 20 2015 Jiri Popelka <jpopelka@redhat.com> - 1.9.72-5
+- do not use py3dir
+- use python_provide macro
+
 * Wed Nov 04 2015 Robert Kuska <rkuska@redhat.com> - 1.9.72-4
 - Rebuilt for Python3.5 rebuild