From c727c9c4d1c15fc27fe2853482ae83fbe4b804bd Mon Sep 17 00:00:00 2001 From: Michal Luscon Date: Tue, 22 Sep 2015 14:04:01 +0200 Subject: [PATCH] Update dnf to 1.1.2-1 --- .gitignore | 1 + dnf-1.1.1-1-to-dnf-1.1.1-2.patch | 139 ------------------------------- dnf.spec | 74 ++++++++++++---- sources | 2 +- 4 files changed, 62 insertions(+), 154 deletions(-) delete mode 100644 dnf-1.1.1-1-to-dnf-1.1.1-2.patch diff --git a/.gitignore b/.gitignore index 13d976c..fe12069 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /dnf-1.0.2.tar.gz /dnf-1.1.0.tar.gz /dnf-1.1.1.tar.gz +/dnf-1.1.2.tar.gz diff --git a/dnf-1.1.1-1-to-dnf-1.1.1-2.patch b/dnf-1.1.1-1-to-dnf-1.1.1-2.patch deleted file mode 100644 index 966dcb8..0000000 --- a/dnf-1.1.1-1-to-dnf-1.1.1-2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 4eb28cc1090567c72217105368767d2f7948f65d Mon Sep 17 00:00:00 2001 -From: Jan Silhan -Date: Mon, 7 Sep 2015 14:33:54 +0200 -Subject: [PATCH 1/4] make clean_requiremets_on_remove=True (RhBug:1260280) - ---- - dnf/yum/config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/yum/config.py b/dnf/yum/config.py -index 9c961e4..9ce446f 100644 ---- a/dnf/yum/config.py -+++ b/dnf/yum/config.py -@@ -818,7 +818,7 @@ class YumConf(BaseConfig): - - rpmverbosity = Option('info') - strict = BoolOption(True) # :api -- clean_requirements_on_remove = BoolOption(False) -+ clean_requirements_on_remove = BoolOption(True) - history_list_view = SelectionOption('commands', - ('single-user-commands', 'users', - 'commands'), --- -2.4.3 - -From 5f8c0396b3bca9b741c7d655289535510d941541 Mon Sep 17 00:00:00 2001 -From: Jan Silhan -Date: Tue, 8 Sep 2015 13:31:48 +0200 -Subject: [PATCH 2/4] fix access to demands (RhBug:1259194) - ---- - dnf/cli/main.py | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/dnf/cli/main.py b/dnf/cli/main.py -index f2dd64d..9a8954c 100644 ---- a/dnf/cli/main.py -+++ b/dnf/cli/main.py -@@ -90,11 +90,6 @@ def main(args): - logger.critical(e.value) - return 1 - except dnf.exceptions.DepsolveError as e: -- ex_Error(e) -- demands = self.cli.demands -- if not demands.allow_erasing: -- logger.info(_("(try to add '--allowerasing' to command line to " -- "replace conflicting packages)")) - return 1 - except dnf.exceptions.Error as e: - return ex_Error(e) -@@ -145,7 +140,15 @@ def _main(base, args): - return ex_IOError(e) - - if cli.demands.resolving: -- ret = resolving(cli, base) -+ try: -+ ret = resolving(cli, base) -+ except dnf.exceptions.DepsolveError as e: -+ ex_Error(e) -+ if not cli.demands.allow_erasing: -+ logger.info(_("(try to add '%s' to command line to" -+ " replace conflicting packages)"), -+ "--allowerasing") -+ raise - if ret: - return ret - --- -2.4.3 - -From 14e9987fbb87283077a1714a3bead1386672233a Mon Sep 17 00:00:00 2001 -From: Jan Silhan -Date: Tue, 8 Sep 2015 13:34:22 +0200 -Subject: [PATCH 3/4] AUTHORS updated - -reverting patch -> erasing author ---- - AUTHORS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/AUTHORS b/AUTHORS -index 8423d9d..f4f14d5 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -57,7 +57,6 @@ DNF CONTRIBUTORS - Adam Salih - Albert Uchytil - Alberto Ruiz -- Christian Stadelmann - Christopher Meng - Daniel Mach - Frank Dana --- -2.4.3 - -From 41bebbb40af5363dd4e77ee9b8821e92f1fae452 Mon Sep 17 00:00:00 2001 -From: Michal Luscon -Date: Tue, 8 Sep 2015 13:58:30 +0200 -Subject: [PATCH 5/5] Automatic commit of package [dnf] minor release - [1.1.1-2]. - ---- - dnf.spec | 6 +++++- - rel-eng/packages/dnf | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/dnf.spec b/dnf.spec -index 60a1a77..b4a8daf 100644 ---- a/dnf.spec -+++ b/dnf.spec -@@ -11,7 +11,7 @@ - - Name: dnf - Version: 1.1.1 --Release: 1%{?snapshot}%{?dist} -+Release: 2%{?snapshot}%{?dist} - Summary: Package manager forked from Yum, using libsolv as a dependency resolver - # For a breakdown of the licensing, see PACKAGE-LICENSING - License: GPLv2+ and GPLv2 and GPL -@@ -250,6 +250,10 @@ exit 0 - %systemd_postun_with_restart dnf-automatic.timer - - %changelog -+* Tue Sep 08 2015 Michal Luscon 1.1.1-2 -+- fix access to demands (RhBug:1259194) (Jan Silhan) -+- make clean_requiremets_on_remove=True (RhBug:1260280) (Jan Silhan) -+ - * Mon Aug 31 2015 Michal Luscon 1.1.1-1 - - Fixed typo (RhBug:1249319) (Adam Salih) - - fixed downgrade with wildcard (RhBug:1234763) (Adam Salih) -diff --git a/rel-eng/packages/dnf b/rel-eng/packages/dnf -index 2cd79c0..62324fc 100644 ---- a/rel-eng/packages/dnf -+++ b/rel-eng/packages/dnf -@@ -1 +1 @@ --1.1.1-1 ./ -+1.1.1-2 ./ --- -2.4.3 diff --git a/dnf.spec b/dnf.spec index c4fc0a9..966b312 100644 --- a/dnf.spec +++ b/dnf.spec @@ -10,19 +10,14 @@ %global py3pluginpath %{python3_sitelib}/dnf-plugins Name: dnf -Version: 1.1.1 -Release: 2%{?snapshot}%{?dist} +Version: 1.1.2 +Release: 1%{?snapshot}%{?dist} Summary: Package manager forked from Yum, using libsolv as a dependency resolver # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ and GPLv2 and GPL URL: https://github.com/rpm-software-management/dnf -# The Source0 tarball can be generated using following commands: -# git clone http://github.com/rpm-software-management/dnf.git -# cd dnf/package -# ./archive -# tarball will be generated in $HOME/rpmbuild/sources/ -Source0: http://rpm-software-management.fedorapeople.org/dnf-%{version}.tar.gz -Patch0: dnf-1.1.1-1-to-dnf-1.1.1-2.patch +# Into distgit it is always uploaded only -1 release of sources +Source0: https://github.com/rpm-software-management/dnf/archive/%{name}-%{version}-1.tar.gz BuildArch: noarch BuildRequires: cmake BuildRequires: gettext @@ -32,11 +27,32 @@ BuildRequires: systemd %if 0%{?fedora} >= 23 Requires: python3-dnf = %{version}-%{release} %else -Requires: python-dnf = %{version}-%{release} +Requires: python2-dnf = %{version}-%{release} %endif Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Provides: dnf-command(autoremove) +Provides: dnf-command(check-update) +Provides: dnf-command(clean) +Provides: dnf-command(distro-sync) +Provides: dnf-command(downgrade) +Provides: dnf-command(group) +Provides: dnf-command(history) +Provides: dnf-command(info) +Provides: dnf-command(install) +Provides: dnf-command(list) +Provides: dnf-command(makecache) +Provides: dnf-command(mark) +Provides: dnf-command(provides) +Provides: dnf-command(reinstall) +Provides: dnf-command(remove) +Provides: dnf-command(repolist) +Provides: dnf-command(repository-packages) +Provides: dnf-command(search) +Provides: dnf-command(updateinfo) +Provides: dnf-command(upgrade) +Provides: dnf-command(upgrade-to) %description Package manager forked from Yum, using libsolv as a dependency resolver. @@ -53,8 +69,9 @@ Summary: As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting %description -n dnf-yum As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF. -%package -n python-dnf +%package -n python2-dnf Summary: Python 2 interface to DNF. +%{?python_provide:%python_provide python2-dnf} BuildRequires: pygpgme BuildRequires: pyliblzma BuildRequires: python2 @@ -78,11 +95,12 @@ Requires: python-librepo >= %{librepo_version} Requires: rpm-plugin-systemd-inhibit Requires: rpm-python >= %{rpm_version} Obsoletes: dnf <= 0.6.4 -%description -n python-dnf +%description -n python2-dnf Python 2 interface to DNF. %package -n python3-dnf Summary: Python 3 interface to DNF. +%{?python_provide:%python_provide python3-dnf} BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-hawkey >= %{hawkey_version} @@ -120,7 +138,6 @@ Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. %prep %setup -q -n dnf-%{version} -%patch0 -p1 rm -rf py3 mkdir ../py3 cp -a . ../py3/ @@ -197,7 +214,7 @@ popd %{_bindir}/yum %{_mandir}/man8/yum.8.gz -%files -n python-dnf +%files -n python2-dnf %{_bindir}/dnf-2 %doc AUTHORS README.rst COPYING PACKAGE-LICENSING %exclude %{python_sitelib}/dnf/automatic @@ -252,6 +269,35 @@ exit 0 %systemd_postun_with_restart dnf-automatic.timer %changelog +* Tue Sep 22 2015 Michal Luscon 1.1.2-1 +- doc: release notes 1.1.2 (Michal Luscon) +- sanitize non Unicode command attributes (RhBug:1262082) (Jan Silhan) +- don't redirect confirmation to stderr RhBug(1258364) (Vladan Kudlac) +- clean: add rpmdb to usage (Vladan Kudlac) +- completion_helper: don't get IndexError (RhBug:1250038) (Vladan Kudlac) +- add --downloadonly switch (RhBug:1048433) (Adam Salih) +- Add globbing support to base.by_provides() (RhBug:11259650) (Valentina + Mukhamedzhanova) +- spec: packaging python(3)-dnf according to new Fedora guidelines + (RhBug:1260198) (Jaroslav Mracek) +- Bug in Source0: URL in dnf.spec fixed (RhBug:126255) (Jaroslav Mracek) +- To dnf.spec added provides dnf-command(command name) for 21 dnf commands + (RhBug:1259657) (jmracek) +- Expire repo cache on failed package download (Valentina Mukhamedzhanova) +- cosmetic: ci: fix the Copr name in the README (Radek Holy) +- Add the continuous integration script (Radek Holy) +- Set proper charset on email in dnf-automatic (RhBug:1254982) (Valentina + Mukhamedzhanova) +- doc: improve configuration description (RhBug:1261766) (Michal Luscon) +- remove: show from which repo a package is (Vladan Kudlac) +- list: show from which repo a package is (RhBug:1234491) (Vladan Kudlac) +- Spelling/grammar fixes (Ville Skyttä) +- install: fix crash when terminal window is small (RhBug:1256531) (Vladan + Kudlac) +- install: mark unification of the progress bar (Vladan Kudlac) +- fix translations in python3 (RhBug:1254687) (Michal Luscon) +- group: CompsQuery now returns group ids (RhBug:1261656) (Michal Luscon) + * Tue Sep 08 2015 Michal Luscon 1.1.1-2 - fix access to demands (RhBug:1259194) (Jan Silhan) - make clean_requiremets_on_remove=True (RhBug:1260280) (Jan Silhan) diff --git a/sources b/sources index c924d07..a39455e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5765ccc2248fb199ff2f2b9c0be72f32 dnf-1.1.1.tar.gz +ecab80a098eae26d46a65628e11b6b4e dnf-1.1.2.tar.gz