From d435a87da4ff5e829c471623cc7a69595742f1e1 Mon Sep 17 00:00:00 2001 From: Jaroslav Mracek Date: Mon, 15 Oct 2018 13:57:23 +0200 Subject: [PATCH] Update to 4.0.0-1 --- .gitignore | 1 + dnf-plugins-core.spec | 101 ++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 59 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index e46bbc2..bb6a29c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /dnf-plugins-core-3.0.2.tar.gz /dnf-plugins-core-3.0.3.tar.gz /dnf-plugins-core-3.0.4.tar.gz +/dnf-plugins-core-4.0.0.tar.gz diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 379e071..ee1b377 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -1,5 +1,4 @@ -%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.6.1} -%{?!dnf_not_compatible: %global dnf_not_compatible 4.0} +%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.7.0} %global dnf_plugins_extra 2.0.0 %global hawkey_version 0.7.0 @@ -17,14 +16,8 @@ %bcond_with yumcompatibility %endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with dnfutils -%else -%bcond_without dnfutils -%endif - Name: dnf-plugins-core -Version: 3.0.4 +Version: 4.0.0 Release: 1%{?dist} Summary: Core Plugins for DNF License: GPLv2+ @@ -67,6 +60,7 @@ Provides: dnf-plugin-repomanage = %{version}-%{release} Provides: dnf-plugin-reposync = %{version}-%{release} %if %{with yumcompatibility} Provides: yum-plugin-copr = %{version}-%{release} +Provides: yum-plugin-auto-update-debug-info = %{version}-%{release} %endif Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} @@ -80,7 +74,6 @@ commands. Additionally provides generate_completion_cache passive plugin. Summary: Core Plugins for DNF %{?python_provide:%python_provide python2-%{name}} BuildRequires: python2-dnf >= %{dnf_lowest_compatible} -BuildRequires: python2-dnf < %{dnf_not_compatible} %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-nose %else @@ -91,7 +84,6 @@ BuildRequires: python2-devel Requires: python2-distro %endif Requires: python2-dnf >= %{dnf_lowest_compatible} -Requires: python2-dnf < %{dnf_not_compatible} Requires: python2-hawkey >= %{hawkey_version} Provides: python2-dnf-plugins-extras-debug = %{version}-%{release} Provides: python2-dnf-plugins-extras-repoclosure = %{version}-%{release} @@ -119,13 +111,11 @@ Summary: Core Plugins for DNF %{?python_provide:%python_provide python3-%{name}} 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} Provides: python3-dnf-plugins-extras-debug = %{version}-%{release} Provides: python3-dnf-plugins-extras-repoclosure = %{version}-%{release} @@ -147,7 +137,7 @@ copr, debug, debuginfo-install, download, needs-restarting, repoclosure, repogra reposync commands. Additionally provides generate_completion_cache passive plugin. %endif -%if %{with dnfutils} +%if %{with yumcompatibility} %package -n dnf-utils Conflicts: yum-utils < 1.1.31-513 %if 0%{?rhel} != 7 @@ -157,10 +147,8 @@ Requires: dnf >= %{dnf_lowest_compatible} Requires: %{name} = %{version}-%{release} %if %{with python3} Requires: python3-dnf >= %{dnf_lowest_compatible} -Requires: python3-dnf < %{dnf_not_compatible} %else Requires: python2-dnf >= %{dnf_lowest_compatible} -Requires: python2-dnf < %{dnf_not_compatible} %endif Summary: Yum-utils CLI compatibility layer @@ -381,7 +369,7 @@ pushd build-py3 popd %endif %find_lang %{name} -%if %{with dnfutils} +%if %{with yumcompatibility} %if %{with python3} mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils %else @@ -390,7 +378,7 @@ popd %endif rm -vf %{buildroot}%{_libexecdir}/dnf-utils-* -%if %{with dnfutils} +%if %{with yumcompatibility} mkdir -p %{buildroot}%{_bindir} ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install @@ -406,6 +394,12 @@ ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader +# These commands don't have a dedicated man page, so let's just point them to +# dnf-utils(1) which contains the descriptions. +ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz +ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz +ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz +ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/yum-utils.1.gz %endif %check @@ -429,31 +423,6 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf.plugin.repograph.* %{_mandir}/man8/dnf.plugin.repomanage.* %{_mandir}/man8/dnf.plugin.reposync.* -%if %{with yumcompatibility} -%{_mandir}/man8/yum-copr.* -%{_mandir}/man1/debuginfo-install.* -%{_mandir}/man1/needs-restarting.* -%{_mandir}/man1/repo-graph.* -%{_mandir}/man1/repoclosure.* -%{_mandir}/man1/repomanage.* -%{_mandir}/man1/reposync.* -%{_mandir}/man1/yum-builddep.* -%{_mandir}/man1/yum-config-manager.* -%{_mandir}/man1/yum-debug-dump.* -%{_mandir}/man1/yum-debug-restore.* -%else -%exclude %{_mandir}/man8/yum-copr.* -%exclude %{_mandir}/man1/debuginfo-install.* -%exclude %{_mandir}/man1/needs-restarting.* -%exclude %{_mandir}/man1/repo-graph.* -%exclude %{_mandir}/man1/repoclosure.* -%exclude %{_mandir}/man1/repomanage.* -%exclude %{_mandir}/man1/reposync.* -%exclude %{_mandir}/man1/yum-builddep.* -%exclude %{_mandir}/man1/yum-config-manager.* -%exclude %{_mandir}/man1/yum-debug-dump.* -%exclude %{_mandir}/man1/yum-debug-restore.* -%endif %if %{with python2} %files -n python2-%{name} -f %{name}.lang @@ -513,7 +482,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{python3_sitelib}/dnfpluginscore/ %endif -%if %{with dnfutils} +%if %{with yumcompatibility} %files -n dnf-utils %{_libexecdir}/dnf-utils %{_bindir}/debuginfo-install @@ -530,6 +499,41 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_bindir}/yum-debug-dump %{_bindir}/yum-debug-restore %{_bindir}/yumdownloader +%{_mandir}/man8/yum-copr.* +%{_mandir}/man1/debuginfo-install.* +%{_mandir}/man1/needs-restarting.* +%{_mandir}/man1/repo-graph.* +%{_mandir}/man1/repoclosure.* +%{_mandir}/man1/repomanage.* +%{_mandir}/man1/reposync.* +%{_mandir}/man1/yum-builddep.* +%{_mandir}/man1/yum-config-manager.* +%{_mandir}/man1/yum-debug-dump.* +%{_mandir}/man1/yum-debug-restore.* +%{_mandir}/man1/yumdownloader.* +%{_mandir}/man1/package-cleanup.* +%{_mandir}/man1/dnf-utils.* +# These are only built with yumcompatibility. +%{_mandir}/man1/find-repos-of-install.* +%{_mandir}/man1/repoquery.* +%{_mandir}/man1/repotrack.* +%{_mandir}/man1/yum-utils.* +%else +# These are built regardless of yumcompatibility so we need to exclude them. +%exclude %{_mandir}/man8/yum-copr.* +%exclude %{_mandir}/man1/debuginfo-install.* +%exclude %{_mandir}/man1/needs-restarting.* +%exclude %{_mandir}/man1/repo-graph.* +%exclude %{_mandir}/man1/repoclosure.* +%exclude %{_mandir}/man1/repomanage.* +%exclude %{_mandir}/man1/reposync.* +%exclude %{_mandir}/man1/yum-builddep.* +%exclude %{_mandir}/man1/yum-config-manager.* +%exclude %{_mandir}/man1/yum-debug-dump.* +%exclude %{_mandir}/man1/yum-debug-restore.* +%exclude %{_mandir}/man1/yumdownloader.* +%exclude %{_mandir}/man1/package-cleanup.* +%exclude %{_mandir}/man1/dnf-utils.* %endif %if 0%{?rhel} == 0 @@ -639,6 +643,15 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %endif %changelog +* Mon Oct 15 2018 Jaroslav Mracek - 4.0.0-1 +- Update to 4.0.0 +- Enhance documentation +- [repoclosure] check every --pkg attribute separately +- [repoclosure] Now accepts nevra as a argument of --pkg option +- [reposync] enhancements (RhBug:1550063,1582152,1550064,1405789,1598068) +- package-cleanup: remove --oldkernels +- Download only packages with unique NEVRAs (RhBug:1612874) + * Tue Sep 25 2018 Jaroslav Mracek - 3.0.4-1 - [copr] Huge upgrade of copr plugin - [spec] Disable building python2 modules on Fedora 30+ diff --git a/sources b/sources index c0f701a..374c738 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnf-plugins-core-3.0.4.tar.gz) = ae154e6018af94007535518c3f197cf96974ace7c3b358927d3e9283d0f3c17ab6ee59b532bcf3ed396cfde9f05e998b4a3e7d44009c43e6b6c2e19fb28d6405 +SHA512 (dnf-plugins-core-4.0.0.tar.gz) = 3dc39d9a2353df368be8233f6e83abe836c130e7cb89f5fc69bd501cfa2114e62affb122bc4a7bd0ac79aec6b1ed5b438d64a0ceb431d803258b20f84b05e881