Hello community, here is the log from the commit of package dnf for openSUSE:Factory checked in at 2019-04-21 09:04:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dnf (Old) and /work/SRC/openSUSE:Factory/.dnf.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnf" Sun Apr 21 09:04:46 2019 rev:12 rq:696402 version:4.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/dnf/dnf.changes 2019-04-01 12:39:57.797961168 +0200 +++ /work/SRC/openSUSE:Factory/.dnf.new.5536/dnf.changes 2019-04-21 09:04:53.322657070 +0200 @@ -1,0 +2,10 @@ +Sat Apr 20 17:38:16 UTC 2019 - Neal Gompa <[email protected]> + +- Ship systemd units and enable dnf-automatic subpackage +- Backport fix to reintroduce subcommand abbreviations (rh#1634232) + * Patch: 0001-Add-command-abbreviations-RhBug-1634232.patch + * Patch: 0002-CMake-Actually-install-aliases.patch +- Backport fix to correctly install the bash completion helper (rh#1695853) + * Patch: 0001-Fix-the-installation-of-completion_helper.py.patch + +------------------------------------------------------------------- New: ---- 0001-Add-command-abbreviations-RhBug-1634232.patch 0001-Fix-the-installation-of-completion_helper.py.patch 0002-CMake-Actually-install-aliases.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnf.spec ++++++ --- /var/tmp/diff_new_pack.GoiGt9/_old 2019-04-21 09:04:56.442660714 +0200 +++ /var/tmp/diff_new_pack.GoiGt9/_new 2019-04-21 09:04:56.462660738 +0200 @@ -29,9 +29,6 @@ %global py3pluginpath %{python3_sitelib}/dnf-plugins -# Disable services units stuff, as we're not using them on openSUSE -%bcond_with service_units - # Tests fail (possibly due to failures in libdnf tests on SUSE) # Until those are resolved, these will remain disabled %bcond_with tests @@ -46,11 +43,21 @@ Url: https://github.com/rpm-software-management/dnf Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Backports from upstream +## Restore command abbreviations dropped between dnf 2.7.5 to now +Patch0001: 0001-Add-command-abbreviations-RhBug-1634232.patch +## Fix installation of aliases +Patch0002: 0002-CMake-Actually-install-aliases.patch +## Fix installation of completion helper +Patch0003: 0001-Fix-the-installation-of-completion_helper.py.patch + + BuildRequires: bash-completion BuildRequires: cmake BuildRequires: gettext BuildRequires: python3-Sphinx BuildRequires: python3-bugzilla +BuildRequires: systemd-rpm-macros Requires: python3-dnf = %{version}-%{release} Recommends: %{name}-lang >= %{version} Recommends: dnf-plugins-core @@ -79,10 +86,7 @@ Provides: dnf-command(upgrade) Provides: dnf-command(upgrade-to) BuildArch: noarch -%if %{with service_units} -BuildRequires: systemd-rpm-macros %{?systemd_requires} -%endif %description DNF is an package manager for RPM systems that was forked from Yum. Among the @@ -135,7 +139,6 @@ %lang_package -%if %{with service_units} %package automatic Summary: Alternative CLI to "dnf upgrade" suitable for automatic, regular execution Group: System/Packages @@ -146,8 +149,6 @@ %description automatic Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. -%endif - %prep %autosetup -p1 @@ -182,13 +183,6 @@ # We don't want this just yet... rm -f %{buildroot}%{confdir}/protected.d/yum.conf -%if ! %{with service_units} -rm %{buildroot}%{_bindir}/dnf-automatic -rm -rf %{buildroot}%{_unitdir} -rm -rf %{buildroot}%{confdir}/automatic.conf -rm -rf %{buildroot}%{_mandir}/man8/%{name}.automatic.8* -%endif - # We don't have ABRT/libreport in openSUSE rm -rf %{buildroot}%{_sysconfdir}/libreport @@ -206,10 +200,8 @@ %{_mandir}/man8/dnf.8.* %{_mandir}/man8/yum2dnf.8.* %dir %{_var}/cache/dnf -%if %{with service_units} %{_unitdir}/dnf-makecache.service %{_unitdir}/dnf-makecache.timer -%endif %files lang -f %{name}.lang @@ -218,10 +210,12 @@ %doc AUTHORS README.rst %dir %{confdir} %dir %{pluginconfpath} +%dir %{confdir}/aliases.d %dir %{confdir}/protected.d %dir %{confdir}/repos.d %dir %{confdir}/vars %config(noreplace) %{confdir}/%{name}.conf +%config(noreplace) %{confdir}/aliases.d/zypper.conf %config(noreplace) %{confdir}/protected.d/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %ghost %{_localstatedir}/log/hawkey.log @@ -254,13 +248,14 @@ %{python3_sitelib}/dnf/ %dir %{py3pluginpath} -%if %{with service_units} %files automatic %license COPYING PACKAGE-LICENSING %doc AUTHORS %{_bindir}/%{name}-automatic %config(noreplace) %{confdir}/automatic.conf %{_mandir}/man8/%{name}.automatic.8.* +%{_unitdir}/%{name}-automatic.service +%{_unitdir}/%{name}-automatic.timer %{_unitdir}/%{name}-automatic-notifyonly.service %{_unitdir}/%{name}-automatic-notifyonly.timer %{_unitdir}/%{name}-automatic-download.service @@ -287,6 +282,5 @@ %postun automatic %systemd_postun_with_restart %{name}-automatic.timer %{name}-automatic-notifyonly.timer %{name}-automatic-download.timer %{name}-automatic-install.timer -%endif %changelog ++++++ 0001-Add-command-abbreviations-RhBug-1634232.patch ++++++ >From da52d0ee8ec53fc67477a448ef9da73e32ce2cf2 Mon Sep 17 00:00:00 2001 From: Pavla Kratochvilova <[email protected]> Date: Thu, 13 Dec 2018 15:24:10 +0100 Subject: [PATCH 1/2] Add command abbreviations (RhBug:1634232) https://bugzilla.redhat.com/show_bug.cgi?id=1634232 These aliases were removed by commit 359f95a4f4e2390641deb88ab3464239e0f76b4b For each command, only one alias is added, the rest is put into aliases config that is not included by default. --- dnf.spec | 1 + dnf/cli/commands/__init__.py | 4 ++-- dnf/cli/commands/distrosync.py | 2 +- dnf/cli/commands/downgrade.py | 2 +- dnf/cli/commands/group.py | 2 +- dnf/cli/commands/install.py | 2 +- dnf/cli/commands/makecache.py | 2 +- dnf/cli/commands/reinstall.py | 2 +- dnf/cli/commands/remove.py | 2 +- dnf/cli/commands/repoquery.py | 2 +- dnf/cli/commands/search.py | 2 +- dnf/cli/commands/shell.py | 2 +- dnf/cli/commands/upgrade.py | 2 +- dnf/cli/commands/upgrademinimal.py | 2 +- etc/dnf/aliases.d/CMakeLists.txt | 1 + etc/dnf/aliases.d/zypper.conf | 7 +++++++ 16 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 etc/dnf/aliases.d/CMakeLists.txt create mode 100644 etc/dnf/aliases.d/zypper.conf diff --git a/dnf.spec b/dnf.spec index b2caa788..ddc92c7b 100644 --- a/dnf.spec +++ b/dnf.spec @@ -412,6 +412,7 @@ ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %dir %{confdir}/protected.d %dir %{confdir}/vars %dir %{confdir}/aliases.d +%exclude %{confdir}/aliases.d/zypper.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/protected.d/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} diff --git a/dnf/cli/commands/__init__.py b/dnf/cli/commands/__init__.py index 0ed55b9e..a688ac7e 100644 --- a/dnf/cli/commands/__init__.py +++ b/dnf/cli/commands/__init__.py @@ -235,7 +235,7 @@ class ProvidesCommand(Command): provides command. """ - aliases = ('provides', 'whatprovides') + aliases = ('provides', 'whatprovides', 'prov') summary = _('find what package provides the given value') @staticmethod @@ -816,7 +816,7 @@ class HistoryCommand(Command): history command. """ - aliases = ('history',) + aliases = ('history', 'hist') summary = _('display, or use, the transaction history') transaction_ids = set() diff --git a/dnf/cli/commands/distrosync.py b/dnf/cli/commands/distrosync.py index 2a6062e7..3d472e5f 100644 --- a/dnf/cli/commands/distrosync.py +++ b/dnf/cli/commands/distrosync.py @@ -28,7 +28,7 @@ class DistroSyncCommand(commands.Command): distro-synch command. """ - aliases = ('distro-sync', 'distrosync', 'distribution-synchronization') + aliases = ('distro-sync', 'distrosync', 'distribution-synchronization', 'dsync') summary = _('synchronize installed packages to the latest available versions') @staticmethod diff --git a/dnf/cli/commands/downgrade.py b/dnf/cli/commands/downgrade.py index f528ddc5..9e27962b 100644 --- a/dnf/cli/commands/downgrade.py +++ b/dnf/cli/commands/downgrade.py @@ -30,7 +30,7 @@ class DowngradeCommand(commands.Command): downgrade command. """ - aliases = ('downgrade',) + aliases = ('downgrade', 'dg') summary = _("Downgrade a package") @staticmethod diff --git a/dnf/cli/commands/group.py b/dnf/cli/commands/group.py index c53bf01f..744c1e05 100644 --- a/dnf/cli/commands/group.py +++ b/dnf/cli/commands/group.py @@ -41,7 +41,7 @@ class GroupCommand(commands.Command): 'groupremove' : 'remove', 'grouperase' : 'remove', 'groupinfo' : 'info'} - aliases = ('group', 'groups') + tuple(direct_commands.keys()) + aliases = ('group', 'groups', 'grp') + tuple(direct_commands.keys()) summary = _('display, or use, the groups information') _CMD_ALIASES = {'update' : 'upgrade', diff --git a/dnf/cli/commands/install.py b/dnf/cli/commands/install.py index c53724a2..f9df6618 100644 --- a/dnf/cli/commands/install.py +++ b/dnf/cli/commands/install.py @@ -43,7 +43,7 @@ class InstallCommand(commands.Command): 'install-nevra': hawkey.FORM_NEVRA} alternatives_provide = 'alternative-for({})' - aliases = ('install', 'localinstall') + tuple(nevra_forms.keys()) + aliases = ('install', 'localinstall', 'in') + tuple(nevra_forms.keys()) summary = _('install a package or packages on your system') @staticmethod diff --git a/dnf/cli/commands/makecache.py b/dnf/cli/commands/makecache.py index c631dca2..c367b1ee 100644 --- a/dnf/cli/commands/makecache.py +++ b/dnf/cli/commands/makecache.py @@ -33,7 +33,7 @@ logger = logging.getLogger("dnf") class MakeCacheCommand(commands.Command): - aliases = ('makecache',) + aliases = ('makecache', 'mc') summary = _('generate the metadata cache') @staticmethod diff --git a/dnf/cli/commands/reinstall.py b/dnf/cli/commands/reinstall.py index e00b6bff..2b3ceac7 100644 --- a/dnf/cli/commands/reinstall.py +++ b/dnf/cli/commands/reinstall.py @@ -34,7 +34,7 @@ class ReinstallCommand(commands.Command): """A class containing methods needed by the cli to execute the reinstall command. """ - aliases = ('reinstall',) + aliases = ('reinstall', 'rei') summary = _('reinstall a package') @staticmethod diff --git a/dnf/cli/commands/remove.py b/dnf/cli/commands/remove.py index 3f2303b0..3c50e48c 100644 --- a/dnf/cli/commands/remove.py +++ b/dnf/cli/commands/remove.py @@ -42,7 +42,7 @@ class RemoveCommand(commands.Command): 'erase-na': hawkey.FORM_NA, 'erase-nevra': hawkey.FORM_NEVRA} - aliases = ('remove', 'erase',) + tuple(nevra_forms.keys()) + aliases = ('remove', 'erase', 'rm') + tuple(nevra_forms.keys()) summary = _('remove a package or packages from your system') @staticmethod diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py index 56e7cac6..941a4709 100644 --- a/dnf/cli/commands/repoquery.py +++ b/dnf/cli/commands/repoquery.py @@ -100,7 +100,7 @@ class RepoQueryCommand(commands.Command): 'repoquery-na': hawkey.FORM_NA, 'repoquery-nevra': hawkey.FORM_NEVRA} - aliases = ('repoquery',) + tuple(nevra_forms.keys()) + aliases = ('repoquery', 'rq') + tuple(nevra_forms.keys()) summary = _('search for packages matching keyword') @staticmethod diff --git a/dnf/cli/commands/search.py b/dnf/cli/commands/search.py index a3d8e96d..47c83143 100644 --- a/dnf/cli/commands/search.py +++ b/dnf/cli/commands/search.py @@ -42,7 +42,7 @@ class SearchCommand(commands.Command): search command. """ - aliases = ('search',) + aliases = ('search', 'se') summary = _('search package details for the given string') @staticmethod diff --git a/dnf/cli/commands/shell.py b/dnf/cli/commands/shell.py index 0a7485bb..e3cae74d 100644 --- a/dnf/cli/commands/shell.py +++ b/dnf/cli/commands/shell.py @@ -43,7 +43,7 @@ class ShellDemandSheet(object): class ShellCommand(commands.Command, cmd.Cmd): - aliases = ('shell',) + aliases = ('shell', 'sh') summary = _('run an interactive DNF shell') MAPPING = {'repo': 'repo', diff --git a/dnf/cli/commands/upgrade.py b/dnf/cli/commands/upgrade.py index d8cad5ff..44789c9a 100644 --- a/dnf/cli/commands/upgrade.py +++ b/dnf/cli/commands/upgrade.py @@ -36,7 +36,7 @@ class UpgradeCommand(commands.Command): """A class containing methods needed by the cli to execute the update command. """ - aliases = ('upgrade', 'update', 'upgrade-to', 'update-to', 'localupdate') + aliases = ('upgrade', 'update', 'upgrade-to', 'update-to', 'localupdate', 'up') summary = _('upgrade a package or packages on your system') @staticmethod diff --git a/dnf/cli/commands/upgrademinimal.py b/dnf/cli/commands/upgrademinimal.py index 9992bc6e..a770e2b7 100644 --- a/dnf/cli/commands/upgrademinimal.py +++ b/dnf/cli/commands/upgrademinimal.py @@ -27,7 +27,7 @@ class UpgradeMinimalCommand(UpgradeCommand): command. """ - aliases = ('upgrade-minimal', 'update-minimal') + aliases = ('upgrade-minimal', 'update-minimal', 'up-min') summary = _("upgrade, but only 'newest' package match which fixes a problem" " that affects your system") diff --git a/etc/dnf/aliases.d/CMakeLists.txt b/etc/dnf/aliases.d/CMakeLists.txt new file mode 100644 index 00000000..7c674409 --- /dev/null +++ b/etc/dnf/aliases.d/CMakeLists.txt @@ -0,0 +1 @@ +INSTALL (FILES "zypper.conf" DESTINATION ${SYSCONFDIR}/dnf/aliases.d) diff --git a/etc/dnf/aliases.d/zypper.conf b/etc/dnf/aliases.d/zypper.conf new file mode 100644 index 00000000..613f33c3 --- /dev/null +++ b/etc/dnf/aliases.d/zypper.conf @@ -0,0 +1,7 @@ +[aliases] +dup = distro-sync +dist-upgrade = distro-sync +ref = makecache +refresh = makecache +ri = reinstall + -- 2.20.1 ++++++ 0001-Fix-the-installation-of-completion_helper.py.patch ++++++ >From d78a76e621b5e7a95b074b86ab5b8fb80d0db40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <[email protected]> Date: Thu, 4 Apr 2019 15:08:59 +0200 Subject: [PATCH] Fix the installation of completion_helper.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change introduced in df19a47d672b09683cc03620a41114cd4239e prevents the installation of completion_helper.py on Fedora 30. Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1695853 Signed-off-by: Robert-André Mauchin <[email protected]> --- dnf/cli/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dnf/cli/CMakeLists.txt b/dnf/cli/CMakeLists.txt index 5e335d0c..a32305bc 100644 --- a/dnf/cli/CMakeLists.txt +++ b/dnf/cli/CMakeLists.txt @@ -1,4 +1,6 @@ FILE(GLOB cli_SRCS *.py) INSTALL (FILES ${cli_SRCS} DESTINATION ${PYTHON_INSTALL_DIR}/dnf/cli) +# completion_helper.py is generated so the glob alone won't see it: +INSTALL (FILES completion_helper.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf/cli) -ADD_SUBDIRECTORY (commands) \ No newline at end of file +ADD_SUBDIRECTORY (commands) -- 2.21.0 ++++++ 0002-CMake-Actually-install-aliases.patch ++++++ >From 7fba570ce719230efdf4539f8a86fd7f6e5cf9b7 Mon Sep 17 00:00:00 2001 From: Neal Gompa <[email protected]> Date: Sat, 20 Apr 2019 13:55:09 -0400 Subject: [PATCH 2/2] CMake: Actually install aliases With the introduction of a default set of aliases in da52d0ee8ec53fc67477a448ef9da73e32ce2cf2, we are supposed to install the alias files. However, the change was incomplete. This fixes the installation of those aliases. --- etc/dnf/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/dnf/CMakeLists.txt b/etc/dnf/CMakeLists.txt index a5dc1b58..844a6106 100644 --- a/etc/dnf/CMakeLists.txt +++ b/etc/dnf/CMakeLists.txt @@ -1,2 +1,3 @@ INSTALL (FILES "dnf.conf" "automatic.conf" DESTINATION ${SYSCONFDIR}/dnf) +ADD_SUBDIRECTORY (aliases.d) ADD_SUBDIRECTORY (protected.d) -- 2.20.1
