[rpms/rpkg] 1.70-1: Avoid duplicate patch in next release

[rpms/rpkg] 1.70-1: Avoid duplicate patch in next release

[Chenxiong Qi]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 6e1818e1fe40a210a921f6844050a656889c0f91
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2016-11-15T15:23:46+08:00
            Stats  : +0/-40 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/6e1818e1fe40a210a921f6844050a656889c0f91?branch=1.70-1

            Log:
            Avoid duplicate patch in next release

The patch has been merged into master in code base. Remove it from here to
avoid conflict in next release.

---
diff --git a/0001-Allow-using-gssapi-for-lookaside-caches.patch b/0001-Allow-using-gssapi-for-lookaside-caches.patch
deleted file mode 100644
index a5bba3d..0000000
--- a/0001-Allow-using-gssapi-for-lookaside-caches.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f9b6951a805f62b04b74f44d5e0b4d4ac1b096d Mon Sep 17 00:00:00 2001
-From: Patrick Uiterwijk <puiterwijk@redhat.com>
-Date: Fri, 14 Oct 2016 21:11:12 +0000
-Subject: [PATCH] Allow using gssapi for lookaside caches
-
-Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
----
- src/pyrpkg/lookaside.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/pyrpkg/lookaside.py b/src/pyrpkg/lookaside.py
-index f46da65..7aa1ae0 100644
---- a/src/pyrpkg/lookaside.py
-+++ b/src/pyrpkg/lookaside.py
-@@ -214,6 +214,9 @@ class CGILookasideCache(object):
-                 else:
-                     self.log.warning("Missing certificate: %s" % self.ca_cert)
- 
-+            c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_GSSNEGOTIATE)
-+            c.setopt(pycurl.USERPWD, ':')
-+
-             try:
-                 c.perform()
-                 status = c.getinfo(pycurl.RESPONSE_CODE)
-@@ -282,6 +285,9 @@ class CGILookasideCache(object):
-                 else:
-                     self.log.warning("Missing certificate: %s" % self.ca_cert)
- 
-+            c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_GSSNEGOTIATE)
-+            c.setopt(pycurl.USERPWD, ':')
-+
-             try:
-                 c.perform()
-                 status = c.getinfo(pycurl.RESPONSE_CODE)
--- 
-2.7.4
-

diff --git a/rpkg.spec b/rpkg.spec
index 36510c8..d859bd7 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -10,8 +10,6 @@ Group:          Applications/System
 License:        GPLv2+ and LGPLv2
 URL:            https://pagure.io/rpkg
 Source0:        https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz
-# Merged in master, but included here so that it reaches people faster
-Patch0:         0001-Allow-using-gssapi-for-lookaside-caches.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pyrpkg >= %{version}-%{release}
@@ -64,7 +62,6 @@ A python library for managing RPM package sources in a git repository.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build