Update dnf-plugins-core to 0.1.21-1

.gitignore

@@ -21,3 +21,4 @@
 /dnf-plugins-core-0.1.18.tar.gz
 /dnf-plugins-core-0.1.19.tar.gz
 /dnf-plugins-core-0.1.20.tar.gz
+/dnf-plugins-core-0.1.21.tar.gz

dnf-plugins-core.spec

@@ -1,25 +1,27 @@
-%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 1.1.4}
+%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 1.1.9}
 %{?!dnf_not_compatible: %global dnf_not_compatible 2.0}
 %global hawkey_version 0.6.1
 
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%bcond_with python3
+%else
+%bcond_without python3
+%endif
+
 Name:           dnf-plugins-core
-Version:    0.1.20
+Version:        0.1.21
-Release:    1%{?snapshot}%{?dist}
+Release:        1%{?dist}
 Summary:        Core Plugins for DNF
-Group:      System Environment/Base
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/dnf-plugins-core
-# source archive is created by running package/archive from a git checkout
+Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source0:    dnf-plugins-core-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
-%if 0%{?fedora} >= 23
+%if %{with python3}
-Requires:   python3-dnf-plugins-core = %{version}-%{release}
+Requires:       python3-%{name} = %{version}-%{release}
-Conflicts:  python-dnf-plugins-core <= 0.1.6-2
 %else
-Requires:   python-dnf-plugins-core = %{version}-%{release}
+Requires:       python2-%{name} = %{version}-%{release}
-Conflicts:  python3-dnf-plugins-core <= 0.1.6-2
 %endif
 Provides:       dnf-command(builddep)
 Provides:       dnf-command(config-manager)
@@ -28,46 +30,42 @@ Provides:   dnf-command(debuginfo-install)
 Provides:       dnf-command(download)
 Provides:       dnf-command(repoquery)
 Provides:       dnf-command(reposync)
+
 %description
 Core Plugins for DNF. This package enhances DNF with builddep, config-manager,
 copr, debuginfo-install, download, needs-restarting, repoquery and
 reposync commands. Additionally provides generate_completion_cache, noroot and
 protected_packages passive plugins.
 
-%package -n python-dnf-plugins-core
+%package -n python2-%{name}
 Summary:        Core Plugins for DNF
-Group:      System Environment/Base
+%{?python_provide:%python_provide python2-%{name}}
-%if 0%{?fedora} < 23
-BuildRequires:   python-dnf >= %{dnf_lowest_compatible}
-BuildRequires:   python-dnf < %{dnf_not_compatible}
-%else
 BuildRequires:  python2-dnf >= %{dnf_lowest_compatible}
 BuildRequires:  python2-dnf < %{dnf_not_compatible}
-%endif
+%if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:  python-nose
+%else
+BuildRequires:  python2-nose
+%endif
 BuildRequires:  python-sphinx
 BuildRequires:  python2-devel
-# F22 + RHELs
-%if 0%{?fedora} < 23
-Requires:   python-dnf >= %{dnf_lowest_compatible}
-Requires:   python-dnf < %{dnf_not_compatible}
-%else
 Requires:       python2-dnf >= %{dnf_lowest_compatible}
 Requires:       python2-dnf < %{dnf_not_compatible}
-%endif
 Requires:       python-hawkey >= %{hawkey_version}
-Conflicts:  dnf-plugins-core <= 0.1.5
+Conflicts:      %{name} <= 0.1.5
 # let the both python plugin versions be updated simultaneously
-Conflicts:  python3-dnf-plugins-core < %{version}-%{release}
+Conflicts:      python3-%{name} < %{version}-%{release}
-%description -n python-dnf-plugins-core
+
+%description -n python2-%{name}
 Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep, copr,
 config-manager, debuginfo-install, download, needs-restarting, repoquery and
 reposync commands. Additionally provides generate_completion_cache, noroot and
 protected_packages passive plugins.
 
-%package -n python3-dnf-plugins-core
+%if %{with python3}
+%package -n python3-%{name}
 Summary:    Core Plugins for DNF
-Group:      System Environment/Base
+%{?python_provide:%python_provide python3-%{name}}
 BuildRequires:  python3-devel
 BuildRequires:  python3-dnf >= %{dnf_lowest_compatible}
 BuildRequires:  python3-dnf < %{dnf_not_compatible}
@@ -76,56 +74,71 @@ BuildRequires:  python3-sphinx
 Requires:       python3-dnf >= %{dnf_lowest_compatible}
 Requires:       python3-dnf < %{dnf_not_compatible}
 Requires:       python3-hawkey >= %{hawkey_version}
-Conflicts:  dnf-plugins-core <= 0.1.5
+Conflicts:      %{name} <= 0.1.5
 # let the both python plugin versions be updated simultaneously
-Conflicts:  python-dnf-plugins-core < %{version}-%{release}
+Conflicts:      python2-%{name} < %{version}-%{release}
-%description -n python3-dnf-plugins-core
+
+%description -n python3-%{name}
 Core Plugins for DNF, Python 3 interface. This package enhances DNF with builddep, copr,
 config-manager, debuginfo-install, download, needs-restarting, repoquery and
 reposync commands. Additionally provides generate_completion_cache, noroot and
 protected_packages passive plugins.
+%endif
 
 %prep
-%setup -q -n dnf-plugins-core-%{version}
+%autosetup
-rm -rf py3
+mkdir build-py2
-mkdir ../py3
+%if %{with python3}
-cp -a . ../py3/
+mkdir build-py3
-mv ../py3 ./
+%endif
 
 %build
-%cmake .
+pushd build-py2
-make %{?_smp_mflags}
+  %cmake ../
-make doc-man
+  %make_build
-pushd py3
-%cmake -DPYTHON_DESIRED:str=3 .
-make %{?_smp_mflags}
   make doc-man
 popd
+%if %{with python3}
+pushd build-py3
+  %cmake ../ -DPYTHON_DESIRED:str=3
+  %make_build
+  make doc-man
+popd
+%endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+pushd build-py2
-%find_lang dnf-plugins-core
+  %make_install
-pushd py3
-make install DESTDIR=$RPM_BUILD_ROOT
 popd
+%if %{with python3}
+pushd build-py3
+  %make_install
+popd
+%endif
+%find_lang %{name}
 
 %check
-PYTHONPATH=./plugins /usr/bin/nosetests-2.* -s tests/
+PYTHONPATH=./plugins nosetests-%{python2_version} -s tests/
-PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/
+%if %{with python3}
+PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
+%endif
 
 %files
 %{_mandir}/man8/dnf.plugin.*
 
-%files -n python-dnf-plugins-core -f %{name}.lang
+%files -n python2-%{name} -f %{name}.lang
-%doc AUTHORS COPYING README.rst
+%license COPYING
+%doc AUTHORS README.rst
 %dir %{_sysconfdir}/dnf/protected.d
 %ghost %{_var}/cache/dnf/packages.db
 %config %{_sysconfdir}/dnf/plugins/*
-%{python_sitelib}/dnf-plugins/*
+%{python2_sitelib}/dnf-plugins/*
-%{python_sitelib}/dnfpluginscore/
+%{python2_sitelib}/dnfpluginscore/
 
-%files -n python3-dnf-plugins-core -f %{name}.lang
+%if %{with python3}
-%doc AUTHORS COPYING README.rst
+%files -n python3-%{name} -f %{name}.lang
+%license COPYING
+%doc AUTHORS README.rst
 %dir %{_sysconfdir}/dnf/protected.d
 %ghost %{_var}/cache/dnf/packages.db
 %config %{_sysconfdir}/dnf/plugins/*
@@ -134,8 +147,33 @@ PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/
 %{python3_sitelib}/dnf-plugins/*
 %{python3_sitelib}/dnf-plugins/__pycache__/*
 %{python3_sitelib}/dnfpluginscore/
+%endif
 
 %changelog
+* Thu May 19 2016 Igor Gnatenko <ignatenko@redhat.com> 0.1.21-1
+- doc: release notes 0.1.21 (Igor Gnatenko)
+- spec: correctly set up requirements for python subpkg (Igor Gnatenko)
+- spec: improve python packaging according to new guidelines & compat with EL7
+  (Igor Gnatenko)
+- tests/support: set priority and cost in RepoStub (Igor Gnatenko)
+- repoquery: sourcerpm does not contain epoch (RhBug:1335959) (Michael Mraka)
+- enforce-api: use api method transaction (Michal Luscon)
+- enforce-api: apply changes from Base class (Michal Luscon)
+- copr: Read the %%distro_arch macro to determine Mageia chroot arch (Neal
+  Gompa (ニール・ゴンパ))
+- copr: Remove unnecessary function calls/options and simplify conditional
+  (Neal Gompa (ニール・ゴンパ))
+- copr: Add Mageia chroot selection support (Neal Gompa (ニール・ゴンパ))
+- copr: Simplify and fix up reading copr chroot config override (Neal Gompa
+  (ニール・ゴンパ))
+- zanata update (Jan Silhan)
+- Add link for other project documentation pages (Jaroslav Mracek)
+- autoglob feature has been moved to filter() (RhBug:1279538) (Michael Mraka)
+- support globs in --what<weak_dep> (RhBug:1303311) (Michael Mraka)
+- repoquery: fix typo (there -> that, and plural form) (Luigi Toscano)
+- copr: fix string - singular is required (Luigi Toscano)
+- doc: release notes updated to vallid plugins version (Jan Šilhan)
+
 * Tue Apr 05 2016 Michal Luscon <mluscon@redhat.com> 0.1.20-1
 - doc: release notes 0.1.20 (Igor Gnatenko)
 - copr: Properly detect reposdir and add chroot override capability (Neal Gompa

sources

@@ -1 +1 @@
-d633d7fc6e0b61f2c400d45ee719504f  dnf-plugins-core-0.1.20.tar.gz
+9548910bd0ba2e3e2c27813f5278aaa6  dnf-plugins-core-0.1.21.tar.gz