rpms/koji/F-7 fedora-config.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 koji.spec, 1.5, 1.6 sources, 1.4, 1.5

[Mike Bonnet (mikeb)]

Author: mikeb

Update of /cvs/pkgs/rpms/koji/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23686

Modified Files:
	.cvsignore koji.spec sources 
Added Files:
	fedora-config.patch 
Log Message:
- update to 1.2.2
- patch /etc/koji.conf so the cli can work out-of-the-box with Fedora Koji

fedora-config.patch:

--- NEW FILE fedora-config.patch ---
--- koji-1.2.2/cli/koji.conf.orig	2007-06-05 15:28:12.751753000 -0400
+++ koji-1.2.2/cli/koji.conf	2007-06-05 15:30:48.710640000 -0400
@@ -3,24 +3,24 @@
 ;configuration for koji cli tool
 
 ;url of XMLRPC server
-;server = http://hub.example.com/kojihub
+server = http://koji.fedoraproject.org/kojihub
 
 ;url of web interface
-;weburl = http://www.example.com/koji
+weburl = http://koji.fedoraproject.org/koji
 
 ;url of package download site
-;pkgurl = http://www.example.com/packages
+pkgurl = http://koji.fedoraproject.org/packages
 
 ;path to the koji top directory
-;topdir = /mnt/koji
+topdir = /mnt/koji
 
 ;configuration for SSL athentication
 
 ;client certificate
-;cert = ~/.koji/client.crt
+cert = ~/.fedora.cert
 
 ;certificate of the CA that issued the client certificate
-;ca = ~/.koji/clientca.crt
+ca = ~/.fedora-upload-ca.cert
 
 ;certificate of the CA that issued the HTTP server certificate
-;serverca = ~/.koji/serverca.crt
+serverca = ~/.fedora-server-ca.cert


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koji/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 May 2007 19:17:44 -0000	1.4
+++ .cvsignore	5 Jun 2007 20:31:00 -0000	1.5
@@ -1 +1 @@
-koji-1.2.0.tar.bz2
+koji-1.2.2.tar.bz2


Index: koji.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koji/F-7/koji.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- koji.spec	15 May 2007 20:56:30 -0000	1.5
+++ koji.spec	5 Jun 2007 20:31:00 -0000	1.6
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define baserelease 3
+%define baserelease 1
 #build with --define 'testbuild 1' to have a timestamp appended to release
 %if x%{?testbuild} == x1
 %define release %{baserelease}.%(date +%%Y%%m%%d.%%H%%M.%%S)
@@ -8,19 +8,21 @@
 %define release %{baserelease}
 %endif
 Name: koji
-Version: 1.2.0
+Version: 1.2.2
 Release: %{release}%{?dist}
 License: LGPL
 Summary: Build system tools
 Group: Applications/System
 URL: http://hosted.fedoraproject.org/projects/koji
-Source: %{name}-%{PACKAGE_VERSION}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 Source1: fedora-packager-setup.sh
+Patch0: fedora-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python-krbV >= 1.0.13
 Requires: rpm-python
 Requires: pyOpenSSL
+Requires: python-urlgrabber
 BuildRequires: python
 
 %description
@@ -82,6 +84,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 %build
 
@@ -151,6 +154,15 @@
 fi
 
 %changelog
+* Tue Jun  5 2007 Mike Bonnet <mikeb at redhat.com> - 1.2.2-1
+- only allow admins to perform non-scratch builds from srpm
+- bug fixes to the cmd-line and web UIs
+- don't allow ExclusiveArch to expand the archlist (bz#239359)
+- add a summary line stating whether the task succeeded or failed to the end of the "watch-task" output
+- add a search box to the header of every page in the web UI
+- new koji download-build command (patch provided by Dan Berrange)
+- patch /etc/koji.conf so the cli will work out-of-the-box with Fedora Koji
+
 * Tue May 15 2007 Jesse Keating <jkeating at redhat.com> - 1.2.0-3
 - More fixes to fedora-packager-setup.sh from mbonnet
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koji/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 May 2007 19:17:44 -0000	1.4
+++ sources	5 Jun 2007 20:31:00 -0000	1.5
@@ -1 +1 @@
-07e9596d3645834a1386120cab0cb7e2  koji-1.2.0.tar.bz2
+74e5271750ea76ab911029b85f43d1d1  koji-1.2.2.tar.bz2