iupdate to koji-1.5.0

.gitignore

@@ -1 +1,2 @@
 koji-1.4.0.tar.bz2
+/koji-1.5.0.tar.bz2

koji.spec

@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: koji
-Version: 1.4.0
+Version: 1.5.0
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: LGPLv2 and GPLv2+
 # koji.ssl libs (from plague) are GPLv2+
 Summary: Build system tools
@@ -10,9 +10,6 @@ Group: Applications/System
 URL: http://fedorahosted.org/koji
 Patch0: fedora-config.patch
 
-# Fix python 2.7 incompatibilities (rbhz#619276)
-Patch1: python27.patch
-
 Source: https://fedorahosted.org/koji/attachment/wiki/KojiRelease/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -107,7 +104,6 @@ koji-web is a web UI to the Koji system.
 %prep
 %setup -q
 %patch0 -p1 -b .orig
-%patch1 -p5
 
 %build
 
@@ -192,6 +188,9 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Wed Dec 01 2010 Dennis Gilmore <dennis@ausil.us> - 1.5.0-1
+- update to 1.5.0
+
 * Tue Aug  3 2010 David Malcolm <dmalcolm@redhat.com> - 1.4.0-4
 - fix python 2.7 incompatibilities (rhbz 619276)
 

python27.patch

@@ -1,24 +0,0 @@
-diff -urN /usr/lib/python2.7/site-packages/koji/ssl/SSLConnection.py /usr/lib/python2.7/site-packages/koji-bak/ssl/SSLConnection.py
---- /usr/lib/python2.7/site-packages/koji/ssl/SSLConnection.py	2010-07-09 04:04:26.000000000 +0200
-+++ /usr/lib/python2.7/site-packages/koji-bak/ssl/SSLConnection.py	2010-08-02 19:39:00.000000000 +0200
-@@ -63,7 +63,7 @@
-         c, a = self.__dict__["conn"].accept()
-         return (SSLConnection(c), a)
- 
--    def makefile(self, mode, bufsize):
-+    def makefile(self,  mode='r', bufsize=-1):
-         """
-         We need to use socket._fileobject Because SSL.Connection
-         doesn't have a 'dup'. Not exactly sure WHY this is, but
-diff -urN /usr/lib/python2.7/site-packages/koji/ssl/XMLRPCServerProxy.py /usr/lib/python2.7/site-packages/koji-bak/ssl/XMLRPCServerProxy.py
---- /usr/lib/python2.7/site-packages/koji/ssl/XMLRPCServerProxy.py	2010-07-09 04:04:26.000000000 +0200
-+++ /usr/lib/python2.7/site-packages/koji-bak/ssl/XMLRPCServerProxy.py	2010-08-02 19:35:04.000000000 +0200
-@@ -41,7 +41,7 @@
-             # Yay for Python 2.2
-             pass
-         _host, _port = urllib.splitport(host)
--        self._https = SSLCommon.PlgHTTPS(_host, (_port and int(_port) or 443), ssl_context=self.ssl_ctx, timeout=self._timeout)
-+        self._https = SSLCommon.PlgHTTPSConnection(_host, (_port and int(_port) or 443), ssl_context=self.ssl_ctx, timeout=self._timeout)
-         return self._https
- 
-     def close(self):

sources

@@ -1 +1 @@
-182584f02660cd574714f55fe49333a3  koji-1.4.0.tar.bz2
+d9610eb7e039a870108c86f49fd77191  koji-1.5.0.tar.bz2