Add missing patch

This commit is contained in:
Michal Luscon 2015-09-22 15:50:29 +02:00
parent 7fd32c8d78
commit 6c8b6295c4
2 changed files with 44 additions and 28 deletions

View File

@ -1,3 +1,17 @@
From b1c94815be71f01c314dcc26af69a19af50ee9d6 Mon Sep 17 00:00:00 2001
From: Michal Luscon <mluscon@redhat.com>
Date: Tue, 22 Sep 2015 14:16:34 +0200
Subject: [PATCH] Automatic commit of package [dnf] release [1.1.2-2].
add hawkey version requirement
revert commit #70956
---
dnf.spec | 11 +++++++----
doc/release_notes.rst | 1 -
doc/summaries_cache | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
rel-eng/packages/dnf | 2 +-
4 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/dnf.spec b/dnf.spec
index 966b312..ad516fa 100644
--- a/dnf.spec
@ -9,7 +23,7 @@ index 966b312..ad516fa 100644
%global libcomps_version 0.1.6
%global rpm_version 4.12.0
@@ -11,13 +11,12 @@
Name: dnf
Version: 1.1.2
-Release: 1%{?snapshot}%{?dist}
@ -26,7 +40,7 @@ index 966b312..ad516fa 100644
BuildRequires: gettext
@@ -269,6 +268,10 @@ exit 0
%systemd_postun_with_restart dnf-automatic.timer
%changelog
+* Tue Sep 22 2015 Michal Luscon <mluscon@redhat.com> 1.1.2-2
+- add hawkey version requirement
@ -53,55 +67,55 @@ index b8ffe0c..2a50df7 100644
+++ b/doc/summaries_cache
@@ -1306,5 +1306,53 @@
[
1210289,
1210289,
"RFE: Have a way to wait on dnf lock rather than terminate"
+ ],
+ ],
+ [
+ 1262082,
+ 1262082,
+ "'ascii' codec can't decode byte 0xc3 in position 40: ordinal not in range(128)"
+ ],
+ ],
+ [
+ 1250038,
+ 1250038,
+ "[abrt] python-dnf: completion_helper.py:84:run:IndexError: list index out of range"
+ ],
+ ],
+ [
+ 1048433,
+ 1048433,
+ "RFE --downloadonly"
+ ],
+ ],
+ [
+ 1259650,
+ 1259650,
+ "\"dnf provides\" or \"dnf repoquery --whatprovides\" does not support globs"
+ ],
+ ],
+ [
+ 1260198,
+ 1260198,
+ "python-dnf should provide python2-dnf"
+ ],
+ ],
+ [
+ 1259657,
+ 1259657,
+ "No dnf-command() provides for dnf commands"
+ ],
+ ],
+ [
+ 1254982,
+ 1254982,
+ "dnf-automatic generates emails with broken charset"
+ ],
+ ],
+ [
+ 1261766,
+ 1261766,
+ "RFE: way to force no metadata expiration system-wide"
+ ],
+ ],
+ [
+ 1234491,
+ 1234491,
+ "[UX] dnf list installed: show repo id the package was installed from"
+ ],
+ ],
+ [
+ 1256531,
+ 1256531,
+ "dnf install crashes if terminal window is too small"
+ ],
+ ],
+ [
+ 1261656,
+ 1261656,
+ "DNF group update doesn't work"
+ ],
+ ],
+ [
+ 1258364,
+ 1258364,
+ "Some important dnf output goes to STDERR and not to STDOUT"
]
]
@ -113,6 +127,6 @@ index 2ee0bef..584636d 100644
@@ -1 +1 @@
-1.1.2-1 ./
+1.1.2-2 ./
--
--
2.4.3

View File

@ -17,6 +17,7 @@ Summary: Package manager forked from Yum, using libsolv as a dependency resolver
License: GPLv2+ and GPLv2 and GPL
URL: https://github.com/rpm-software-management/dnf
Source0: https://github.com/rpm-software-management/dnf/archive/%{name}-%{version}.tar.gz
Patch0: dnf-1.1.2-1-to-dnf-1.1.2-2.patch
BuildArch: noarch
BuildRequires: cmake
BuildRequires: gettext
@ -137,6 +138,7 @@ 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/