Update to 3.0.1-1

This commit is contained in:
Jaroslav Mracek 2018-06-26 18:07:09 +02:00
parent 43d6e509b3
commit 8a36db93c6
3 changed files with 74 additions and 14 deletions

1
.gitignore vendored
View File

@ -33,3 +33,4 @@
/dnf-plugins-core-2.1.3.tar.gz
/dnf-plugins-core-2.1.4.tar.gz
/dnf-plugins-core-2.1.5.tar.gz
/dnf-plugins-core-3.0.1.tar.gz

View File

@ -1,5 +1,5 @@
%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 2.7.0}
%{?!dnf_not_compatible: %global dnf_not_compatible 3.0}
%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.0.1}
%{?!dnf_not_compatible: %global dnf_not_compatible 4.0}
%global dnf_plugins_extra 2.0.0
%global hawkey_version 0.7.0
@ -9,9 +9,15 @@
%bcond_without python3
%endif
%if 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
%endif
Name: dnf-plugins-core
Version: 2.1.5
Release: 5%{?dist}
Version: 3.0.1
Release: 1%{?dist}
Summary: Core Plugins for DNF
License: GPLv2+
URL: https://github.com/rpm-software-management/dnf-plugins-core
@ -58,6 +64,7 @@ Core Plugins for DNF. This package enhances DNF with builddep, config-manager, c
debuginfo-install, download, needs-restarting, repoclosure, repograph, repomanage and reposync
commands. Additionally provides generate_completion_cache passive plugin.
%if %{with python2}
%package -n python2-%{name}
Summary: Core Plugins for DNF
%{?python_provide:%python_provide python2-%{name}}
@ -69,6 +76,9 @@ BuildRequires: python-nose
BuildRequires: python2-nose
%endif
BuildRequires: python2-devel
%if 0%{?fedora}
Requires: python2-distro
%endif
Requires: python2-dnf >= %{dnf_lowest_compatible}
Requires: python2-dnf < %{dnf_not_compatible}
Requires: python2-hawkey >= %{hawkey_version}
@ -90,6 +100,7 @@ Conflicts: python-%{name} < %{version}-%{release}
Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep, config-manager,
copr, degug, debuginfo-install, download, needs-restarting, repoclosure, repograph, repomanage and
reposync commands. Additionally provides generate_completion_cache passive plugin.
%endif
%if %{with python3}
%package -n python3-%{name}
@ -99,13 +110,12 @@ BuildRequires: python3-devel
BuildRequires: python3-dnf >= %{dnf_lowest_compatible}
BuildRequires: python3-dnf < %{dnf_not_compatible}
BuildRequires: python3-nose
%if 0%{?fedora}
Requires: python3-distro
%endif
Requires: python3-dnf >= %{dnf_lowest_compatible}
Requires: python3-dnf < %{dnf_not_compatible}
Requires: python3-hawkey >= %{hawkey_version}
Conflicts: %{name} <= 0.1.5
# let the both python plugin versions be updated simultaneously
Conflicts: python2-%{name} < %{version}-%{release}
Conflicts: python-%{name} < %{version}-%{release}
Provides: python3-dnf-plugins-extras-debug = %{version}-%{release}
Provides: python3-dnf-plugins-extras-repoclosure = %{version}-%{release}
Provides: python3-dnf-plugins-extras-repograph = %{version}-%{release}
@ -115,6 +125,11 @@ Obsoletes: python3-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra}
Obsoletes: python3-dnf-plugins-extras-repograph < %{dnf_plugins_extra}
Obsoletes: python3-dnf-plugins-extras-repomanage < %{dnf_plugins_extra}
Conflicts: %{name} <= 0.1.5
# let the both python plugin versions be updated simultaneously
Conflicts: python2-%{name} < %{version}-%{release}
Conflicts: python-%{name} < %{version}-%{release}
%description -n python3-%{name}
Core Plugins for DNF, Python 3 interface. This package enhances DNF with builddep, config-manager,
copr, debug, debuginfo-install, download, needs-restarting, repoclosure, repograph, repomanage and
@ -122,7 +137,10 @@ reposync commands. Additionally provides generate_completion_cache passive plugi
%endif
%package -n dnf-utils
Conflicts: yum-utils
Conflicts: yum-utils < 1.1.31-513
%if 0%{?rhel} != 7
Provides: yum-utils = %{version}-%{release}
%endif
Requires: dnf >= %{dnf_lowest_compatible}
Requires: %{name} = %{version}-%{release}
%if %{with python3}
@ -140,6 +158,7 @@ debuginfo-install, repograph, package-cleanup, repoclosure, repomanage,
repoquery, reposync, repotrack, builddep, config-manager, debug, and
download that use new implementations using DNF.
%if %{with python2}
%package -n python2-dnf-plugin-leaves
Summary: Leaves Plugin for DNF
Requires: python2-%{name} = %{version}-%{release}
@ -156,6 +175,7 @@ Obsoletes: python2-dnf-plugins-extras-leaves < %{dnf_plugins_extra}
%description -n python2-dnf-plugin-leaves
Leaves Plugin for DNF, Python 2 version. List all installed packages
not required by any other installed package.
%endif
%if %{with python3}
%package -n python3-dnf-plugin-leaves
@ -174,6 +194,7 @@ Leaves Plugin for DNF, Python 3 version. List all installed packages
not required by any other installed package.
%endif
%if 0%{?rhel} == 0 && %{with python2}
%package -n python2-dnf-plugin-local
Summary: Local Plugin for DNF
Requires: %{_bindir}/createrepo_c
@ -190,8 +211,9 @@ Obsoletes: python2-dnf-plugins-extras-local < %{dnf_plugins_extra}
%description -n python2-dnf-plugin-local
Local Plugin for DNF, Python 2 version. Automatically copy all downloaded packages to a
repository on the local filesystem and generating repo metadata.
%endif
%if %{with python3}
%if %{with python3} && 0%{?rhel} == 0
%package -n python3-dnf-plugin-local
Summary: Local Plugin for DNF
Requires: %{_bindir}/createrepo_c
@ -208,6 +230,7 @@ Local Plugin for DNF, Python 3 version. Automatically copy all downloaded
packages to a repository on the local filesystem and generating repo metadata.
%endif
%if %{with python2}
%package -n python2-dnf-plugin-migrate
Summary: Migrate Plugin for DNF
Requires: python2-%{name} = %{version}-%{release}
@ -222,7 +245,9 @@ Obsoletes: python-dnf-plugins-extras-migrate < %{dnf_plugins_extra}
%description -n python2-dnf-plugin-migrate
Migrate Plugin for DNF, Python 2 version. Migrates history, group and yumdb data from yum to dnf.
%endif
%if %{with python2}
%package -n python2-dnf-plugin-show-leaves
Summary: Leaves Plugin for DNF
Requires: python2-%{name} = %{version}-%{release}
@ -241,6 +266,7 @@ Obsoletes: python2-dnf-plugins-extras-show-leaves < %{dnf_plugins_extra}
Show-leaves Plugin for DNF, Python 2 version. List all installed
packages that are no longer required by any other installed package
after a transaction.
%endif
%if %{with python3}
%package -n python3-dnf-plugin-show-leaves
@ -261,6 +287,7 @@ packages that are no longer required by any other installed package
after a transaction.
%endif
%if %{with python2}
%package -n python2-dnf-plugin-versionlock
Summary: Version Lock Plugin for DNF
Requires: python2-%{name} = %{version}-%{release}
@ -278,6 +305,7 @@ Obsoletes: python2-dnf-plugins-extras-versionlock < %{dnf_plugins_extra}
Version lock plugin takes a set of name/versions for packages and excludes all other
versions of those packages. This allows you to e.g. protect packages from being
updated by newer versions.
%endif
%if %{with python3}
%package -n python3-dnf-plugin-versionlock
@ -299,29 +327,35 @@ updated by newer versions.
%prep
%autosetup
%if %{with python2}
mkdir build-py2
%endif
%if %{with python3}
mkdir build-py3
%endif
%build
%if %{with python2}
pushd build-py2
%cmake ../
%cmake ../ -DWITHOUT_LOCAL:str=0%{?rhel}
%make_build
make doc-man
popd
%endif
%if %{with python3}
pushd build-py3
%cmake ../ -DPYTHON_DESIRED:str=3
%cmake ../ -DPYTHON_DESIRED:str=3 -DWITHOUT_LOCAL:str=0%{?rhel}
%make_build
make doc-man
popd
%endif
%install
%if %{with python2}
pushd build-py2
%make_install
popd
%endif
%if %{with python3}
pushd build-py3
%make_install
@ -352,7 +386,9 @@ ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
%check
%if %{with python2}
PYTHONPATH=./plugins nosetests-%{python2_version} -s tests/
%endif
%if %{with python3}
PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%endif
@ -371,6 +407,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%{_mandir}/man8/dnf.plugin.repomanage.*
%{_mandir}/man8/dnf.plugin.reposync.*
%if %{with python2}
%files -n python2-%{name} -f %{name}.lang
%license COPYING
%doc AUTHORS README.rst
@ -389,6 +426,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%{python2_sitelib}/dnf-plugins/repomanage.*
%{python2_sitelib}/dnf-plugins/reposync.*
%{python2_sitelib}/dnfpluginscore/
%endif
%if %{with python3}
%files -n python3-%{name} -f %{name}.lang
@ -440,9 +478,11 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%{_bindir}/yum-debug-restore
%{_bindir}/yumdownloader
%if %{with python2}
%files -n python2-dnf-plugin-leaves
%{python2_sitelib}/dnf-plugins/leaves.*
%{_mandir}/man8/dnf.plugin.leaves.*
%endif
%if %{with python3}
%files -n python3-dnf-plugin-leaves
@ -451,12 +491,14 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%{_mandir}/man8/dnf.plugin.leaves.*
%endif
%if 0%{?rhel} == 0 && %{with python2}
%files -n python2-dnf-plugin-local
%config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf
%{python2_sitelib}/dnf-plugins/local.*
%{_mandir}/man8/dnf.plugin.local.*
%endif
%if %{with python3}
%if %{with python3} && 0%{?rhel} == 0
%files -n python3-dnf-plugin-local
%config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf
%{python3_sitelib}/dnf-plugins/local.*
@ -464,13 +506,17 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%{_mandir}/man8/dnf.plugin.local.*
%endif
%if %{with python2}
%files -n python2-dnf-plugin-migrate
%{python2_sitelib}/dnf-plugins/migrate.*
%{_mandir}/man8/dnf.plugin.migrate.*
%endif
%if %{with python2}
%files -n python2-dnf-plugin-show-leaves
%{python2_sitelib}/dnf-plugins/show_leaves.*
%{_mandir}/man8/dnf.plugin.show-leaves.*
%endif
%if %{with python3}
%files -n python3-dnf-plugin-show-leaves
@ -479,11 +525,13 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%{_mandir}/man8/dnf.plugin.show-leaves.*
%endif
%if %{with python2}
%files -n python2-dnf-plugin-versionlock
%config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.conf
%config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.list
%{python2_sitelib}/dnf-plugins/versionlock.*
%{_mandir}/man8/dnf.plugin.versionlock.*
%endif
%if %{with python3}
%files -n python3-dnf-plugin-versionlock
@ -495,6 +543,17 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
%endif
%changelog
* Tue Jun 26 2018 Jaroslav Mracek <jmracek@redhat.com> 3.0.1-1
- Enhanced documentation
- Resolves: rhbz#1576594
- Resolves: rhbz#1530081
- Resolves: rhbz#1547897
- Resolves: rhbz#1550006
- Resolves: rhbz#1431491
- Resolves: rhbz#1516857
- Resolves: rhbz#1499623
- Resolves: rhbz#1489724
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 2.1.5-5
- Rebuilt for Python 3.7

View File

@ -1 +1 @@
SHA512 (dnf-plugins-core-2.1.5.tar.gz) = 72122cb03d4188935bd5862f57a4de5a57db544f6d36f4313e1fd4dd877a67ceb3d0e63559b39b863e333825c69a16f29f312719136bae0b66717518a2219d95
SHA512 (dnf-plugins-core-3.0.1.tar.gz) = cb01717985663fce96da46296b0eda7330adb7281656bf70c0b53a1a5582725e70426b5c37d0e8dcec80c799d57098f16b5b84ac48ea75fa82d62d684d10c44f