rpms/koji/EL-6 .cvsignore, 1.12, 1.13 fedora-config.patch, 1.1, 1.2 koji.spec, 1.19, 1.20 sources, 1.12, 1.13

[Dennis Gilmore]

Author: ausil

Update of /cvs/extras/rpms/koji/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv848

Modified Files:
	.cvsignore fedora-config.patch koji.spec sources 
Log Message:
update to koji 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koji/EL-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Nov 2009 19:28:54 -0000	1.12
+++ .cvsignore	9 Jul 2010 15:43:38 -0000	1.13
@@ -1 +1 @@
-koji-1.3.2.tar.bz2
+koji-1.4.0.tar.bz2

fedora-config.patch:
 koji.conf |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: fedora-config.patch
===================================================================
RCS file: /cvs/extras/rpms/koji/EL-6/fedora-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fedora-config.patch	5 Jun 2007 20:34:20 -0000	1.1
+++ fedora-config.patch	9 Jul 2010 15:43:38 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- 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 @@
  ;configuration for koji cli tool
  
@@ -19,7 +19,7 @@
 -;topdir = /mnt/koji
 +topdir = /mnt/koji
  
- ;configuration for SSL athentication
+ ;configuration for SSL authentication
  
  ;client certificate
 -;cert = ~/.koji/client.crt
@@ -27,7 +27,7 @@
  
  ;certificate of the CA that issued the client certificate
 -;ca = ~/.koji/clientca.crt
-+ca = ~/.fedora-upload-ca.cert
++ca = ~/.fedora-server-ca.cert
  
  ;certificate of the CA that issued the HTTP server certificate
 -;serverca = ~/.koji/serverca.crt


Index: koji.spec
===================================================================
RCS file: /cvs/extras/rpms/koji/EL-6/koji.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- koji.spec	12 May 2010 03:19:41 -0000	1.19
+++ koji.spec	9 Jul 2010 15:43:38 -0000	1.20
@@ -1,9 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: koji
-Version: 1.3.2
-Release: 2%{?dist}
-License: LGPLv2
+Version: 1.4.0
+Release: 1%{?dist}
+License: LGPLv2 and GPLv2+
+# koji.ssl libs (from plague) are GPLv2+
 Summary: Build system tools
 Group: Applications/System
 URL: http://fedorahosted.org/koji
@@ -46,6 +47,8 @@ Plugins to the koji XMLRPC interface
 %package builder
 Summary: Koji RPM builder daemon
 Group: Applications/System
+License: LGPLv2 and GPLv2+
+#mergerepos (from createrepo) is GPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: mock >= 0.9.14
 Requires(post): /sbin/chkconfig
@@ -60,15 +63,14 @@ Requires: rpm-build
 Requires: redhat-rpm-config
 Requires: pykickstart                                                                               
 Requires: pycdio   
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires: createrepo >= 0.9.6
-%else
-%if 0%{?rhel}
+%endif
+%if 0%{?rhel} == 5
 Requires: python-createrepo >= 0.9.6
 Requires: python-hashlib
 Requires: createrepo
 %endif
-%endif
 
 %description builder
 koji-builder is the daemon that runs on build machines and executes
@@ -128,6 +130,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %{_prefix}/lib/koji-hub-plugins
 %{_prefix}/lib/koji-hub-plugins/*.py*
+%dir %{_sysconfdir}/koji-hub/plugins/
+%config(noreplace) %{_sysconfdir}/koji-hub/plugins/messagebus.conf
 
 %files utils
 %defattr(-,root,root)
@@ -182,8 +186,26 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
-* Tue May 11 2010 Dennis Gilmore <dennis at ausil.us> - 1.3.2-2
-- fix Requires for EL-6 on -builder package
+* Fri Jul 09 2010 Dennis Gilmore <dennis at ausil.us> - 1.4.0-1
+- update to 1.4.0
+- Merge mead branch: support for building jars with Maven *
+- support for building appliance images *
+- soft dependencies for LiveCD/Appliance features
+- smarter prioritization of repo regenerations
+- package list policy to determine if package list changes are allowed
+- channel policy to determine which channel a task is placed in
+- edit host data via webui
+- description and comment fields for hosts *
+- cleaner log entries for kojihub
+- track user data in versioned tables *
+- allow setting retry parameters for the cli
+- track start time for tasks *
+- allow packages built from the same srpm to span multiple external repos
+- make the command used to fetch sources configuable per repo
+- kojira: remove unexpected directories
+- let kojid to decide if it can handle a noarch task
+- avoid extraneous ssl handshakes
+- schema changes to support starred items
 
 * Fri Nov 20 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.2-1
 - update to 1.3.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koji/EL-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Nov 2009 19:28:54 -0000	1.12
+++ sources	9 Jul 2010 15:43:38 -0000	1.13
@@ -1 +1 @@
-c776f838f126276269e4bba2c2cea097  koji-1.3.2.tar.bz2
+182584f02660cd574714f55fe49333a3  koji-1.4.0.tar.bz2