[rpms/fedpkg] 1.48-1: New upstream release 1.24

[Chenxiong Qi <cqi@redhat.com>]

A new commit has been pushed.

Repo   : rpms/fedpkg
Branch : 1.48-1
Commit : f0c500b971b7109e6d0b5282ad1dc09811faf9cd
Author : Chenxiong Qi <cqi@redhat.com>
Date   : 2016-06-28T14:29:53+08:00
Stats  : +18/-72 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/fedpkg/c/f0c500b971b7109e6d0b5282ad1dc09811faf9cd?branch=1.48-1

Log:
New upstream release 1.24

---
diff --git a/.gitignore b/.gitignore
index 95fb7d1..43a8e29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /fedpkg-1.21.tar.bz2
 /fedpkg-1.22.tar.bz2
 /fedpkg-1.23.tar.bz2
+/fedpkg-1.24.tar.bz2

diff --git a/0001-Fix-tests-on-Python-2.6.patch b/0001-Fix-tests-on-Python-2.6.patch
deleted file mode 100644
index 9b22417..0000000
--- a/0001-Fix-tests-on-Python-2.6.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 49433ad7f88ee201999577eca5cb2a031be5a431 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Thu, 31 Mar 2016 14:35:03 +0200
-Subject: [PATCH 1/2] Fix tests on Python 2.6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-check_output was only added to subprocess in 2.7
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
-
-diff --git a/test/test_retire.py b/test/test_retire.py
-index e824428..af48ece 100644
---- a/test/test_retire.py
-+++ b/test/test_retire.py
-@@ -40,8 +40,10 @@ class RetireTestCase(unittest.TestCase):
-             cwd=self.tmpdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- 
-     def _get_latest_commit(self):
--        return subprocess.check_output(
--            ['git', 'log', '-n', '1', '--pretty=%s'], cwd=self.tmpdir).strip()
-+        proc = subprocess.Popen(['git', 'log', '-n', '1', '--pretty=%s'],
-+                                cwd=self.tmpdir, stdout=subprocess.PIPE)
-+        out, err = proc.communicate()
-+        return out.strip()
- 
-     def _fake_client(self, args):
-         config = ConfigParser.SafeConfigParser()
--- 
-2.5.5
-

diff --git a/0002-Configure-git-user-for-tests.patch b/0002-Configure-git-user-for-tests.patch
deleted file mode 100644
index 5848b77..0000000
--- a/0002-Configure-git-user-for-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4875cdfbc6160fca81f6ebefaf300d5921aca32f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Thu, 7 Apr 2016 09:32:55 +0200
-Subject: [PATCH 2/2] Configure git user for tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes a problem when running the tests in unconfigured environment,
-such as Koji.
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
-
-diff --git a/test/test_retire.py b/test/test_retire.py
-index af48ece..e80b94e 100644
---- a/test/test_retire.py
-+++ b/test/test_retire.py
-@@ -27,6 +27,12 @@ class RetireTestCase(unittest.TestCase):
-             ['git', 'init'],
-             cwd=self.tmpdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-         subprocess.check_call(
-+            ['git', 'config', 'user.name', 'John Doe'],
-+            cwd=self.tmpdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+        subprocess.check_call(
-+            ['git', 'config', 'user.email', 'jdoe@example.com'],
-+            cwd=self.tmpdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+        subprocess.check_call(
-             ['git', 'remote', 'add', 'origin', origin],
-             cwd=self.tmpdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-         subprocess.check_call(
--- 
-2.5.5
-

diff --git a/fedpkg.spec b/fedpkg.spec
index ad3684f..82d4409 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -7,16 +7,14 @@
 %endif
 
 Name:           fedpkg
-Version:        1.23
-Release:        3%{?dist}
+Version:        1.24
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://pagure.io/fedpkg
 Source0:        http://pagure.io/releases/fedpkg/fedpkg-%{version}.tar.bz2
-Patch0:         0001-Fix-tests-on-Python-2.6.patch
-Patch1:         0002-Configure-git-user-for-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pyrpkg >= 1.43, redhat-rpm-config
@@ -44,8 +42,6 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -79,9 +75,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 # For noarch packages: sitelib
 %{python_sitelib}/*
+# zsh completion
+%{_datadir}/zsh/site-functions/_%{name}
 
 
 %changelog
+* Mon Jun 27 2016 Chenxiong Qi <cqi@redhat.com> - 1.24-1
+- Add a guide for releasing new version (lsedlar)
+- Merge #10 `Python 3 compatibility fixes` (lubomir.sedlar)
+- Add ZSH completion by Alexey I. Froloff (lsedlar)
+- Merge #28 `fix broken when non-ASCII in path` (lubomir.sedlar)
+- fix broken when non-ASCII in path (cqi)
+- Fix tests for retire with new rpkg (lsedlar)
+- use setup.cfg to make bztar as the default format for sdist (cqi)
+- Configure git user for tests (lsedlar)
+- Fix tests on Python 2.6 (lsedlar)
+- Python 3 compatibility fixes (ville.skytta)
+
 * Wed Jun 08 2016 Lubomír Sedlář <lsedlar@redhat.com> - 1.23-3
 - Rename bash completion on EPEL
 

diff --git a/sources b/sources
index 6d1df0e..c1b1d17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e09cc757f5062ab0d5cac6cbf65c64e2  fedpkg-1.23.tar.bz2
+1456415954b14187f1e2ae3ebae73dd1  fedpkg-1.24.tar.bz2