From bd91f988fd9402eaceaffb91bbfa4084a6953478 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 1 Jun 2012 10:56:04 -0500
Subject: [PATCH] update to koji 1.7.0

---
 .gitignore          |  1 +
 fedora-config.patch | 12 ++++++------
 koji.spec           | 17 +++++++++++------
 sources             |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92a7f70..5e70751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 koji-1.4.0.tar.bz2
 /koji-1.5.0.tar.bz2
 /koji-1.6.0.tar.bz2
+/koji-1.7.0.tar.bz2
diff --git a/fedora-config.patch b/fedora-config.patch
index a5bf323..df36b26 100644
--- a/fedora-config.patch
+++ b/fedora-config.patch
@@ -1,6 +1,6 @@
---- koji-1.4.0/cli/koji.conf.orig	2010-07-08 21:04:26.000000000 -0500
-+++ koji-1.4.0/cli/koji.conf	2010-07-09 10:21:24.000000000 -0500
-@@ -3,24 +3,24 @@
+--- koji-1.7.0/cli/koji.conf.orig	2012-05-31 14:05:43.000000000 -0500
++++ koji-1.7.0/cli/koji.conf	2012-06-01 10:50:12.000000000 -0500
+@@ -3,13 +3,13 @@
  ;configuration for koji cli tool
  
  ;url of XMLRPC server
@@ -16,9 +16,8 @@
 +pkgurl = http://koji.fedoraproject.org/packages
  
  ;path to the koji top directory
--;topdir = /mnt/koji
-+topdir = /mnt/koji
- 
+ ;topdir = /mnt/koji
+@@ -22,10 +22,11 @@
  ;configuration for SSL authentication
  
  ;client certificate
@@ -32,3 +31,4 @@
  ;certificate of the CA that issued the HTTP server certificate
 -;serverca = ~/.koji/serverca.crt
 +serverca = ~/.fedora-server-ca.cert
++
diff --git a/koji.spec b/koji.spec
index 415ddd0..b6d41e9 100644
--- a/koji.spec
+++ b/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.6.0
-Release: 3%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
 License: LGPLv2 and GPLv2+
 # koji.ssl libs (from plague) are GPLv2+
 Summary: Build system tools
@@ -10,7 +10,7 @@ Group: Applications/System
 URL: http://fedorahosted.org/koji
 Patch0: fedora-config.patch
 
-Source: https://fedorahosted.org/releases/k/o/koji/%{name}-%{version}.tar.bz2
+Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python-krbV >= 1.0.13
@@ -29,7 +29,7 @@ Group: Applications/Internet
 License: LGPLv2 and GPLv2
 # rpmdiff lib (from rpmlint) is GPLv2 (only)
 Requires: httpd
-Requires: mod_python
+Requires: mod_wsgi
 Requires: postgresql-python
 Requires: %{name} = %{version}-%{release}
 
@@ -109,7 +109,7 @@ Utilities for the Koji system
 Summary: Koji Web UI
 Group: Applications/Internet
 Requires: httpd
-Requires: mod_python
+Requires: mod_wsgi
 Requires: mod_auth_kerb
 Requires: postgresql-python
 Requires: python-cheetah
@@ -171,7 +171,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/koji-web
 %{_sysconfdir}/kojiweb
-%config(noreplace) /etc/httpd/conf.d/kojiweb.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/kojiweb.conf
+%config(noreplace) %{_sysconfdir}/kojiweb/web.conf
 
 %files builder
 %defattr(-,root,root)
@@ -224,6 +225,10 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Fri Jun 01 2012 Dennis Gilmore <dennis@ausil.us> - 1.7.0-1
+- update to 1.7.0 many bugfixes and improvements
+- now uses mod_wsgi 
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 149c60f..90e04d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-069e8229aa2b44698bbbbdea8d24aff4  koji-1.6.0.tar.bz2
+84be4c5d35ccaa11a3f00191db5fd2e8  koji-1.7.0.tar.bz2