[rpms/rpkg] 1.70-1: Rebuilt to rename pyrpkg to python2-rpkg

[rpms/rpkg] 1.70-1: Rebuilt to rename pyrpkg to python2-rpkg

[Chenxiong Qi]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 1754f98e8e62a9604815cbb57c655446fa4ffbcd
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2017-03-28T14:59:46+08:00
            Stats  : +55/-41 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/1754f98e8e62a9604815cbb57c655446fa4ffbcd?branch=1.70-1

            Log:
            Rebuilt to rename pyrpkg to python2-rpkg

Major changes are

* pyrpkg is renamed to python2-rpkg. Meanwhile, the CLI package named
  rpkg is not a separate RPM anymore, it is moved to
  /usr/share/rpkg/examples/cli.
* Buildroot is remove since EPEL5 is not a target supported
  distribution.
* Remove unused dependent packages curl and openssh-clients.
* Change Group to Development/Libraries as rpkg is a library for
  implementing CLI to interact with dist-git and Koji.

Resolves: rhbz#1400592

---
diff --git a/rpkg.spec b/rpkg.spec
index a22c3e1..4430adb 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -3,60 +3,66 @@
 
 Name:           rpkg
 Version:        1.49
-Release:        1%{?dist}
-Summary:        Utility for interacting with rpm+git packaging systems
+Release:        2%{?dist}
 
-Group:          Applications/System
+Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
 URL:            https://pagure.io/rpkg
-Source0:        https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
+BuildArch:      noarch
 
-Requires:       pyrpkg >= %{version}-%{release}
+Requires:       mock
+Requires:       redhat-rpm-config
+Requires:       rpm-build
+Requires:       rpmlint
 
-# Use this to force plugins to update
-Conflicts:      fedpkg <= 1.7
+BuildRequires:  rpmlint
+
+
+%description
+Python library for interacting with rpm+git
+
+
+%package -n python2-%{name}
+Summary:        Python library for interacting with rpm+git
 
-BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+
 # We br these things for man page generation due to imports
-BuildRequires:  GitPython, koji, python-pycurl
+BuildRequires:  GitPython
+BuildRequires:  koji
+BuildRequires:  python2-cccolutils
 BuildRequires:  python-kitchen
-BuildRequires:  python-nose
-BuildRequires:  python-mock
 BuildRequires:  python-osbs
+BuildRequires:  python-pycurl
 BuildRequires:  python-rpmfluff
-BuildRequires:  rpmlint
+BuildRequires:  python-six >= 1.9.0
+
+BuildRequires:  python-nose
+BuildRequires:  python-mock
 
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  python-argparse
 %endif
 
-%description
-A tool for managing RPM package sources in a git repository.
-
-%package -n pyrpkg
-Summary:        Python library for interacting with rpm+git
-Group:          Applications/Databases
 Requires:       GitPython >= 0.2.0
-Requires:       python-pycurl, koji
-Requires:       rpm-build, rpm-python
-Requires:       rpmlint, mock, curl, openssh-clients, redhat-rpm-config
+Requires:       koji
+Requires:       python2-cccolutils
 Requires:       python-kitchen
 Requires:       python-osbs
+Requires:       python-pycurl
 Requires:       python-six >= 1.9.0
-Requires:       python2-cccolutils
-
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires:       python-argparse
-%endif
+Requires:       rpm-python
 
 Conflicts:      fedpkg < 1.26
 
-BuildRequires:  python-six >= 1.9.0
-BuildRequires:  python2-cccolutils
+# Backward compatibility with capability pyrpkg
+Provides: pyrpkg = %{version}-%{release}
+# All old versions before 1.49-1 should not be used anymore
+Obsoletes: pyrpkg < 1.49-2
+
 
-%description -n pyrpkg
+%description -n python2-%{name}
 A python library for managing RPM package sources in a git repository.
 
 
@@ -72,8 +78,19 @@ A python library for managing RPM package sources in a git repository.
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
-%{__install} -p -m 0644 rpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
+%{__install} -d $example_cli_dir
+
+# Install example CLI to rpkg own data directory
+%{__install} -d ${example_cli_dir}%{_bindir}
+%{__install} -p -m 0644 $RPM_BUILD_ROOT%{_bindir}/rpkg ${example_cli_dir}%{_bindir}
+rm -rf $RPM_BUILD_ROOT%{_bindir}
+
+%{__install} -d ${example_cli_dir}%{_mandir}/man1
+%{__install} -p -m 0644 rpkg.1 ${example_cli_dir}%{_mandir}/man1
+
+mv $RPM_BUILD_ROOT%{_sysconfdir} ${example_cli_dir}
 
 %check
 nosetests tests
@@ -82,20 +99,17 @@ nosetests tests
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%config(noreplace) %{_sysconfdir}/rpkg
-%{_sysconfdir}/bash_completion.d
-%{_bindir}/%{name}
-%{_mandir}/*/*
-
-%files -n pyrpkg
+%files -n python2-%{name}
 %doc COPYING COPYING-koji LGPL README CHANGELOG.rst
 # For noarch packages: sitelib
 %{python_sitelib}/pyrpkg
-%{python_sitelib}/rpkg-%{version}-py?.?.egg-info
-
+%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
+%{_datadir}/%{name}
 
 %changelog
+* Mon Mar 27 2017 Chenxiong Qi <cqi@redhat.com> - 1.49-2
+- Rebuilt to rename pyrpkg to python2-rpkg
+
 * Wed Feb 22 2017 Chenxiong Qi <cqi@redhat.com> - 1.49-1
 - More upload PyCURL fixes for EL 7 (merlin)
 - Move tag inheritance check into a separate method (cqi)