Auto sync2gitlab import of dnf-plugins-core-4.0.21-16.el8.src.rpm
This commit is contained in:
CentOS Sources
parent
c2473fbc6c
commit
a9e71309aa
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,45 @@
|
||||
From 0afd47edc60fb7fe5c72fa64bca413bdce82d900 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kolarik <jkolarik@redhat.com>
|
||||
Date: Thu, 11 Aug 2022 14:12:06 +0200
|
||||
Subject: [PATCH] builddep: Warning when using macros with source rpms
|
||||
(RhBug:2077820)
|
||||
|
||||
= changelog =
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2077820
|
||||
---
|
||||
doc/builddep.rst | 2 +-
|
||||
plugins/builddep.py | 4 ++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/doc/builddep.rst b/doc/builddep.rst
|
||||
index 6e9bde6..97eb823 100644
|
||||
--- a/doc/builddep.rst
|
||||
+++ b/doc/builddep.rst
|
||||
@@ -31,7 +31,7 @@ All general DNF options are accepted, see `Options` in :manpage:`dnf(8)` for det
|
||||
Show this help.
|
||||
|
||||
``-D <macro expr>, --define <macro expr>``
|
||||
- Define the RPM macro named `macro` to the value `expr` when parsing spec files.
|
||||
+ Define the RPM macro named `macro` to the value `expr` when parsing spec files. Does not apply for source rpm files.
|
||||
|
||||
``--spec``
|
||||
Treat arguments as .spec files.
|
||||
diff --git a/plugins/builddep.py b/plugins/builddep.py
|
||||
index e3da012..e7dac43 100644
|
||||
--- a/plugins/builddep.py
|
||||
+++ b/plugins/builddep.py
|
||||
@@ -204,6 +204,10 @@ class BuildDepCommand(dnf.cli.Command):
|
||||
err = _("Not all dependencies satisfied")
|
||||
raise dnf.exceptions.Error(err)
|
||||
|
||||
+ if self.opts.define:
|
||||
+ logger.warning(_("Warning: -D or --define arguments have no meaning "
|
||||
+ "for source rpm packages."))
|
||||
+
|
||||
def _spec_deps(self, spec_fn):
|
||||
try:
|
||||
spec = rpm.spec(spec_fn)
|
||||
--
|
||||
2.37.1
|
||||
|
||||
1711
0025-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch
Normal file
1711
0025-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -34,7 +34,7 @@
|
||||
|
||||
Name: dnf-plugins-core
|
||||
Version: 4.0.21
|
||||
Release: 14.1%{?dist}
|
||||
Release: 16%{?dist}
|
||||
Summary: Core Plugins for DNF
|
||||
License: GPLv2+
|
||||
URL: https://github.com/rpm-software-management/dnf-plugins-core
|
||||
@ -62,7 +62,8 @@ Patch20: 0020-Shorter-verification-that-the-project-exists.patch
|
||||
Patch21: 0021-Better-error-message-for-dnf-copr-enable.patch
|
||||
Patch22: 0022-copr-allow-specifying-protocol-as-part-of-hub.patch
|
||||
Patch23: 0023-copr-Guess-EPEL-chroots-for-CentOS-Stream-RhBug-2058.patch
|
||||
Patch24: 0024-Update-translations-RHEL-8.7.patch
|
||||
Patch24: 0024-builddep-Warning-when-using-macros-with-source-rpms-.patch
|
||||
Patch25: 0025-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch
|
||||
|
||||
|
||||
BuildArch: noarch
|
||||
@ -90,6 +91,9 @@ Provides: dnf-command(repograph)
|
||||
Provides: dnf-command(repomanage)
|
||||
Provides: dnf-command(reposync)
|
||||
Provides: dnf-command(repodiff)
|
||||
Provides: dnf-command(system-upgrade)
|
||||
Provides: dnf-command(offline-upgrade)
|
||||
Provides: dnf-command(offline-distrosync)
|
||||
Provides: dnf-plugins-extras-debug = %{version}-%{release}
|
||||
Provides: dnf-plugins-extras-repoclosure = %{version}-%{release}
|
||||
Provides: dnf-plugins-extras-repograph = %{version}-%{release}
|
||||
@ -106,6 +110,7 @@ Provides: dnf-plugin-repodiff = %{version}-%{release}
|
||||
Provides: dnf-plugin-repograph = %{version}-%{release}
|
||||
Provides: dnf-plugin-repomanage = %{version}-%{release}
|
||||
Provides: dnf-plugin-reposync = %{version}-%{release}
|
||||
Provides: dnf-plugin-system-upgrade = %{version}-%{release}
|
||||
%if %{with yumcompatibility}
|
||||
Provides: yum-plugin-copr = %{version}-%{release}
|
||||
Provides: yum-plugin-changelog = %{version}-%{release}
|
||||
@ -158,8 +163,9 @@ Conflicts: python-%{name} < %{version}-%{release}
|
||||
|
||||
%description -n python2-%{name}
|
||||
Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep,
|
||||
config-manager, copr, degug, debuginfo-install, download, groups-manager, needs-restarting,
|
||||
repoclosure, repograph, repomanage, reposync, changelog and repodiff commands.
|
||||
config-manager, copr, degug, debuginfo-install, download, needs-restarting,
|
||||
groups-manager, repoclosure, repograph, repomanage, reposync, changelog,
|
||||
repodiff, system-upgrade, offline-upgrade and offline-distrosync commands.
|
||||
Additionally provides generate_completion_cache passive plugin.
|
||||
%endif
|
||||
|
||||
@ -170,6 +176,10 @@ Summary: Core Plugins for DNF
|
||||
BuildRequires: python3-dbus
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-dnf >= %{dnf_lowest_compatible}
|
||||
BuildRequires: python3-systemd
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: systemd
|
||||
%{?systemd_ordering}
|
||||
%if 0%{?fedora}
|
||||
Requires: python3-distro
|
||||
%endif
|
||||
@ -177,14 +187,17 @@ Requires: python3-dbus
|
||||
Requires: python3-dnf >= %{dnf_lowest_compatible}
|
||||
Requires: python3-hawkey >= %{hawkey_version}
|
||||
Requires: python3-dateutil
|
||||
Requires: python3-systemd
|
||||
Provides: python3-dnf-plugins-extras-debug = %{version}-%{release}
|
||||
Provides: python3-dnf-plugins-extras-repoclosure = %{version}-%{release}
|
||||
Provides: python3-dnf-plugins-extras-repograph = %{version}-%{release}
|
||||
Provides: python3-dnf-plugins-extras-repomanage = %{version}-%{release}
|
||||
Provides: python3-dnf-plugin-system-upgrade = %{version}-%{release}
|
||||
Obsoletes: python3-dnf-plugins-extras-debug < %{dnf_plugins_extra}
|
||||
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}
|
||||
Obsoletes: python3-dnf-plugin-system-upgrade < %{version}-%{release}
|
||||
|
||||
Conflicts: %{name} <= 0.1.5
|
||||
# let the both python plugin versions be updated simultaneously
|
||||
@ -193,8 +206,9 @@ 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, groups-manager, needs-restarting,
|
||||
repoclosure, repograph, repomanage, reposync, changelog and repodiff commands.
|
||||
config-manager, copr, debug, debuginfo-install, download, needs-restarting,
|
||||
groups-manager, repoclosure, repograph, repomanage, reposync, changelog,
|
||||
repodiff, system-upgrade, offline-upgrade and offline-distrosync commands.
|
||||
Additionally provides generate_completion_cache passive plugin.
|
||||
%endif
|
||||
|
||||
@ -475,6 +489,17 @@ pushd build-py3
|
||||
%make_install
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants/
|
||||
pushd %{buildroot}%{_unitdir}/system-update.target.wants/
|
||||
ln -sr ../dnf-system-upgrade.service
|
||||
popd
|
||||
|
||||
ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-upgrade.8.gz
|
||||
ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-distrosync.8.gz
|
||||
%endif
|
||||
|
||||
%find_lang %{name}
|
||||
%if %{with yumutils}
|
||||
%if %{with python3}
|
||||
@ -539,6 +564,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
|
||||
%{_mandir}/man8/dnf-repograph.*
|
||||
%{_mandir}/man8/dnf-repomanage.*
|
||||
%{_mandir}/man8/dnf-reposync.*
|
||||
%{_mandir}/man8/dnf-system-upgrade.*
|
||||
%{_mandir}/man8/dnf-offline-upgrade.*
|
||||
%{_mandir}/man8/dnf-offline-distrosync.*
|
||||
%if %{with yumcompatibility}
|
||||
%{_mandir}/man1/yum-changelog.*
|
||||
%{_mandir}/man8/yum-copr.*
|
||||
@ -596,6 +624,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
|
||||
%{python3_sitelib}/dnf-plugins/repograph.py
|
||||
%{python3_sitelib}/dnf-plugins/repomanage.py
|
||||
%{python3_sitelib}/dnf-plugins/reposync.py
|
||||
%{python3_sitelib}/dnf-plugins/system_upgrade.py
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/builddep.*
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/changelog.*
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/config_manager.*
|
||||
@ -611,7 +640,11 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/repograph.*
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/repomanage.*
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/reposync.*
|
||||
%{python3_sitelib}/dnf-plugins/__pycache__/system_upgrade.*
|
||||
%{python3_sitelib}/dnfpluginscore/
|
||||
%{_unitdir}/dnf-system-upgrade.service
|
||||
%{_unitdir}/dnf-system-upgrade-cleanup.service
|
||||
%{_unitdir}/system-update.target.wants/dnf-system-upgrade.service
|
||||
%endif
|
||||
|
||||
%if %{with yumutils}
|
||||
@ -807,8 +840,11 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Sep 14 2022 Marek Blaha <mblaha@redhat.com> - 4.0.21-14.1
|
||||
- Update translations
|
||||
* Wed Oct 26 2022 Nicola Sella <nsella@redhat.com> - 4.0.21-16
|
||||
- Move system-upgrade plugin to core (RhBug:2054235)
|
||||
|
||||
* Tue Sep 13 2022 Lukas Hrazky <lhrazky@redhat.com> - 4.0.21-15
|
||||
- builddep: Warning when using macros with source rpms (RhBug:2077820)
|
||||
|
||||
* Tue Jul 19 2022 Lukas Hrazky <lhrazky@redhat.com> - 4.0.21-14
|
||||
- [copr] Guess EPEL chroots for CentOS Stream
|
||||
|
||||
Loading…
Reference in New Issue
Block a user