[rpms/fedpkg] 1.48-1: New release 1.26-4

[rpms/fedpkg] 1.48-1: New release 1.26-4

[Chenxiong Qi]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 6db542c1b6365ca08dd095e5a01c14cc905c905e
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2016-12-16T17:27:17+08:00
            Stats  : +39/-2 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/6db542c1b6365ca08dd095e5a01c14cc905c905e?branch=1.48-1

            Log:
            New release 1.26-4

This release contains a temporary patch to disable anongiturl over
https, that is because
https://pagure.io/fedora-infrastructure/issue/5636. After that issue
gets resolved, this patch can be removed.

---
diff --git a/0001-Disable-anongiturl-over-https.patch b/0001-Disable-anongiturl-over-https.patch
new file mode 100644
index 0000000..e03ad5f
--- /dev/null
+++ b/0001-Disable-anongiturl-over-https.patch
@@ -0,0 +1,30 @@
+From 20f6d59990cdeca8057e21e0cc734305bd39f0b7 Mon Sep 17 00:00:00 2001
+From: Chenxiong Qi <cqi@redhat.com>
+Date: Fri, 16 Dec 2016 16:49:36 +0800
+Subject: [PATCH] Disable anongiturl over https
+
+Because of https://pagure.io/fedora-infrastructure/issue/5636, changing
+to anongiturl over https will cause build failure in Koji. After, issue
+5636 is resolved, drop this patch.
+
+Signed-off-by: Chenxiong Qi <cqi@redhat.com>
+---
+ conf/etc/rpkg/fedpkg.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
+index d134eda..c927b80 100644
+--- a/conf/etc/rpkg/fedpkg.conf
++++ b/conf/etc/rpkg/fedpkg.conf
+@@ -3,7 +3,7 @@ lookaside = https://src.fedoraproject.org/repo/pkgs
+ lookasidehash = sha512
+ lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(module)s
+-anongiturl = https://src.fedoraproject.org/git/%(module)s
++anongiturl = git://pkgs.fedoraproject.org/%(module)s
+ tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc
+ branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
+ kojiconfig = /etc/koji.conf
+-- 
+2.7.4
+

diff --git a/fedpkg.spec b/fedpkg.spec
index 21a7fa9..bb73b19 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -8,13 +8,14 @@
 
 Name:           fedpkg
 Version:        1.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
+Patch0:         0001-Disable-anongiturl-over-https.patch
 
 Requires:       redhat-rpm-config
 Requires:       pyrpkg >= 1.47
@@ -49,6 +50,7 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -92,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 15 2016 Chenxiong Qi <cqi@redhat.com> - 1.26-4
+- Fix handle unicode chars in git log - BZ#1404724 (cqi)
+- Fix: make fedpkg workable with bodhi 2 CLI - #87 (cqi)
+- Fix --dist/--release option for 'master' %dist detection (praiskup)
+
 * Mon Dec 12 2016 Lubomír Sedlář <lsedlar@redhat.com> - 1.26-3
 - sha512 should be also used in fedpkg-stage (cqi)
 - conf: s/kerberos_realm/kerberos_realms/ (i.gnatenko.brain)

diff --git a/sources b/sources
index 64ac5f8..aaa3e4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.26.tar.bz2) = babb0a78a28483bbef6f9bf76a6500d2ece95e180cd2eee2e9d83ac0f0acd6993c2b0f82241b5dc5a1cdad32758cef37a01bfdccaa8d382ae3ab579000429cc4
+SHA512 (fedpkg-1.26.tar.bz2) = 60b029bcbd4eadee04ae3cc1f6faa69593c95e0657c8dc93b3c76c4161f12aff3fb95aba5b969868425baf933e8ae8589484aa5364b551d9977e914ff900ef5c