diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e35e873..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/dnf-plugin-system-upgrade-0.4.0.tar.gz -/dnf-plugin-system-upgrade-0.4.1.tar.gz -/dnf-plugin-system-upgrade-0.7.0.tar.gz -/dnf-plugin-system-upgrade-0.7.1.tar.gz diff --git a/0001-Fix-test-for-deprecated-args.patch b/0001-Fix-test-for-deprecated-args.patch deleted file mode 100644 index 8559507..0000000 --- a/0001-Fix-test-for-deprecated-args.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 02be99b227b05248125fccb5551bed75c9447917 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sat, 14 Nov 2015 10:29:10 -0500 -Subject: [PATCH] Fix test for deprecated args - -Apparently there is no mock function assert_called_once. Python 3.5 -started failing with non-existent calls to assert*. Under previous -versions this call wasn't doing anything. ---- - tests/test_system_upgrade.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_system_upgrade.py b/tests/test_system_upgrade.py -index d47b19cdc9..f43d20e545 100644 ---- a/tests/test_system_upgrade.py -+++ b/tests/test_system_upgrade.py -@@ -188,7 +188,7 @@ class ArgparseTestCase(unittest.TestCase): - def assert_warning(self, args): - with mock.patch('system_upgrade.logger.warning') as warning: - self.cmd.parse_args(args) -- warning.assert_called_once() -+ self.assertTrue(warning.called) - - def assert_error(self, args, message): - with self.assertRaises(CliError) as cm: --- -2.6.3 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..56d6811 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +moved into dnf-plugins-extras diff --git a/dnf-plugin-system-upgrade.spec b/dnf-plugin-system-upgrade.spec deleted file mode 100644 index 9b20953..0000000 --- a/dnf-plugin-system-upgrade.spec +++ /dev/null @@ -1,166 +0,0 @@ -Name: dnf-plugin-system-upgrade -Version: 0.7.1 -Release: 6%{?dist} -Summary: System Upgrade plugin for DNF -Group: System Environment/Base -License: GPLv2+ -URL: https://github.com/rpm-software-management/dnf-plugin-system-upgrade -Source0: https://github.com/rpm-software-management/dnf-plugin-system-upgrade/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -%if 0%{?fedora} >= 23 -# DNF in Fedora 23 uses Python 3 by default -Requires: python3-%{name} = %{version}-%{release} -%else -Requires: python2-%{name} = %{version}-%{release} -%endif - -Provides: dnf-command(system-upgrade) - -# The plugin itself doesn't technically require dnf, but /usr/bin/fedup does. -# So either we split out a subpackage for /usr/bin/fedup or we Require dnf. -Requires: dnf - -# This replaces the old fedup package.. -Provides: fedup = 0.9.3-1 -Obsoletes: fedup < 0.9.3-1 -# ..just for cleanliness, obsolete fedup-dracut too. (#1275085) -Obsoletes: fedup-dracut - -Conflicts: PackageKit < 1.0.8 - -# distro-sync upgrade doesn't work with old libsolv and hawkey. See -# https://bugzilla.redhat.com/show_bug.cgi?id=1260989 -Requires: libsolv >= 0.6.14-2 -Requires: hawkey >= 0.6.2-1 - -BuildArch: noarch -BuildRequires: pkgconfig -BuildRequires: systemd -BuildRequires: gettext -BuildRequires: python2-devel -BuildRequires: python2-mock -BuildRequires: python2-dnf -BuildRequires: python2-systemd -BuildRequires: python3-devel -BuildRequires: python3-dnf -BuildRequires: python3-systemd - -%description -System Upgrade plugin for DNF. This package provides the systemd -services required to make the upgrade work. - -%package -n python3-%{name} -%{?python_provide:%python_provide python3-%{name}} -Summary: %{summary} -Requires: python3-dnf >= 1.1.4 -Requires: python3-systemd -Requires: %{name} = %{version}-%{release} -%description -n python3-%{name} -System Upgrade plugin for DNF (Python 3 version). -This package provides the "system-upgrade" command. - -%package -n python2-%{name} -%{?python_provide:%python_provide python2-%{name}} -Summary: %{summary} -Requires: python2-dnf >= 1.1.4 -Requires: python2-systemd -Requires: %{name} = %{version}-%{release} -%description -n python2-%{name} -System Upgrade plugin for DNF (Python 2 version). -This package provides the "system-upgrade" command. - -%prep -%setup -q - -%build -%make_build - -%install -make install DESTDIR=%{buildroot} PYTHON=%{__python2} -%find_lang %{name} -make install-plugin DESTDIR=%{buildroot} PYTHON=%{__python3} - -%check -make check PYTHON=%{__python2} LANG=de_DE.UTF-8 -make check PYTHON=%{__python3} - -%pre -# if we're replacing fedup, we need to make sure it cleans up its leftovers. -# (see https://bugzilla.redhat.com/show_bug.cgi?id=1264948) -if [ "$1" == 1 -a -x /usr/bin/fedup ]; then - # save the old package cache (if the new one isn't populated) - if [ -d /var/lib/system-upgrade ]; then - mv -f -T /var/lib/system-upgrade /var/lib/dnf/system-upgrade || : - fi - # clean up everything else - /usr/bin/fedup --clean || : -fi - -%files -f %{name}.lang -%license LICENSE -%doc README.md -%{_mandir}/man8/dnf.plugin.system-upgrade.8* -%{_mandir}/man8/fedup.8* -%{_unitdir}/dnf-system-upgrade.service -%dir %{_unitdir}/system-update.target.wants -%{_unitdir}/system-update.target.wants/dnf-system-upgrade.service -%{_bindir}/fedup - -%files -n python3-%{name} -%license LICENSE -%{python3_sitelib}/dnf-plugins/system_upgrade.py -%{python3_sitelib}/dnf-plugins/__pycache__/system_upgrade*.py* - -%files -n python2-%{name} -%license LICENSE -%{python_sitelib}/dnf-plugins/system_upgrade.py* - -%changelog -* Fri Feb 10 2017 Fedora Release Engineering - 0.7.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 0.7.1-5 -- Rebuild for Python 3.6 - -* Tue Nov 29 2016 Zbigniew Jędrzejewski-Szmek - 0.7.1-4 -- Make sure the main package is installed if dnf plugins are (#1395686) - -* Tue Jul 19 2016 Fedora Release Engineering - 0.7.1-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Feb 03 2016 Fedora Release Engineering - 0.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Nov 11 2015 Will Woods 0.7.1-1 -- Fix crash at startup with zh_CN and other utf8 locales (#1278031, #1277895) -- Fix upgrades using `-x` or `--exclude` - -* Tue Oct 27 2015 Will Woods 0.7.0-1 -- Add `log` subcommand (to show upgrade logs) -- Fix upgrades on systems without `plymouth` installed -- Fix upgrades using `--best` or `--allowerasing` (#1266589) -- Drop compatibility with DNF < 1.1.0; bump version number to avoid confusion. -- Clean up stuff left behind by the old fedup package (#1264948) - -* Tue Sep 15 2015 Will Woods 0.4.1-1 -- Fix `dnf system-upgrade clean` (rhbz#1262145) -- Fix duplicate messages in plymouth 'details' output (github#13) -- Add man pages dnf.plugin.system-upgrade(8) and fedup(8) - -* Wed Sep 09 2015 Kalev Lember 0.4.0-2 -- Conflict with older PackageKit versions that didn't let other programs do - offline updates (#1259937) -- Pull in the Python 3 version of the DNF plugin on Fedora 23 (#1260164) - -* Mon Aug 31 2015 Will Woods 0.4.0-1 -- Meet Fedora packaging requirements -- Add translations to `fedup` wrapper - -* Thu Aug 20 2015 Will Woods 0.3.0-1 -- Add `fedup` backward-compatibility wrapper - -* Tue Aug 18 2015 Will Woods 0.2.0-1 -- Fix upgrade startup - -* Wed Aug 05 2015 Will Woods 0.0.1-1 -- Initial packaging diff --git a/sources b/sources deleted file mode 100644 index 292780c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bb3575ca0fab720a61cb92326d96cea4 dnf-plugin-system-upgrade-0.7.1.tar.gz