From d139c2a012e5ec7314785d3ad686bddd498eee63 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Dec 15 2016 17:12:23 +0000 Subject: New release 1.47-6 --- diff --git a/0001-Default-krb_rdns-to-None.patch b/0001-Default-krb_rdns-to-None.patch deleted file mode 100644 index 36ba43d..0000000 --- a/0001-Default-krb_rdns-to-None.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 65a0d9c726d19ac594de003f83eb69a58ea21a4f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= -Date: Mon, 12 Dec 2016 15:08:30 +0100 -Subject: [PATCH] Default krb_rdns to None -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Using `False` as default value will break setups where the value is not -specified and is expected to be `True`; for example `rhpkg` will not be -able to talk to Brew. - -This patch removes the empty value, so that the option is only used when -actually specified in config. - -Signed-off-by: Lubomír Sedlář ---- - pyrpkg/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py -index e3fd456..247356f 100644 ---- a/pyrpkg/__init__.py -+++ b/pyrpkg/__init__.py -@@ -248,7 +248,7 @@ class Commands(object): - 'topurl': 'http://localhost/kojiroot', - 'use_fast_upload': None, - 'weburl': 'http://localhost/koji', -- 'krb_rdns': False, -+ 'krb_rdns': None, - } - - # Process the configs in order, global, user, then any option passed --- -2.9.3 - diff --git a/rpkg.spec b/rpkg.spec index 4a22d14..b5b3725 100644 --- a/rpkg.spec +++ b/rpkg.spec @@ -3,14 +3,13 @@ Name: rpkg Version: 1.47 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utility for interacting with rpm+git packaging systems Group: Applications/System License: GPLv2+ and LGPLv2 URL: https://pagure.io/rpkg Source0: https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz -Patch0: 0001-Default-krb_rdns-to-None.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pyrpkg >= %{version}-%{release} @@ -63,7 +62,6 @@ A python library for managing RPM package sources in a git repository. %prep %setup -q -%patch0 -p1 %build @@ -98,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 15 2016 Chenxiong Qi - 1.47-6 +- Add missing import koji.ssl.SSLCommon - BZ#1404102 (cqi) +- Fix upload with old PyCURL - BZ#1241059 (lsedlar) + * Mon Dec 12 2016 Lubomír Sedlář - 1.47-5 - Fix default value for krb_rdns options diff --git a/sources b/sources index cf4ab9b..80b3f1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpkg-1.47.tar.gz) = cba11f16e42d0dffca3ff7692cb23a8236d30523a9ef7703c9c0c9565b7bf4805a38adc86ad6157210ff37ae17d56a3c8651b1d93e5c4b720da8f26b6e5a28f8 +SHA512 (rpkg-1.47.tar.gz) = e5badf306c0bbea73ddf9ca508285fcbced3f279fff58ae64ff74e916dd7d5db245de58d1ffaf7898921200e7854d0715318fcd7df6d105a5b0f48e457a80739