[packages/koji] up to 1.9.0

glen glen at pld-linux.org
Mon Jun 2 01:08:45 CEST 2014 

commit 5ce61a5694be95ee69d40dd3b1ababed3a58aeb7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 2 01:54:49 2014 +0300

    up to 1.9.0
    
    sync spec with fedora
    bf3a87061cde7735bf4cf663111d560843d9e16a

 koji.spec | 132 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 35 deletions(-)
---
diff --git a/koji.spec b/koji.spec
index a7a446e..ed028b9 100644
--- a/koji.spec
+++ b/koji.spec
@@ -1,31 +1,18 @@
 # TODO
 # - package real webapp
-# - unpackaged:
-#   /etc/koji-gc/koji-gc.conf
-#   /etc/koji-hub/hub.conf
-#   /etc/koji-hub/plugins/messagebus.conf
-#   /etc/koji-shadow/koji-shadow.conf
-#   /usr/lib/koji-hub-plugins/echo.py
-#   /usr/lib/koji-hub-plugins/echo.pyc
-#   /usr/lib/koji-hub-plugins/messagebus.py
-#   /usr/lib/koji-hub-plugins/messagebus.pyc
-#   /usr/libexec/koji-hub/rpmdiff
-#   /usr/libexec/kojid/mergerepos
-#   /usr/sbin/koji-gc
-#   /usr/sbin/koji-shadow
-#   /usr/share/koji-builder/lib/tasks.py
-#   /usr/share/koji-builder/lib/tasks.pyc
 # - need pld packages:
-#   python-krbV, mocK
+#   python-krbV
+# - add kojibuilder to mock group
 Summary:	Build system tools
 Summary(pl.UTF-8):	Narzędzia systemu budującego
 Name:		koji
-Version:	1.6.0
-Release:	0.3
+Version:	1.9.0
+Release:	0.1
+# koji.ssl libs (from plague) are GPLv2+
 License:	LGPL v2 and GPL v2+
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/k/o/koji/%{name}-%{version}.tar.bz2
-# Source0-md5:	069e8229aa2b44698bbbbdea8d24aff4
+# Source0-md5:	0ce900022f67324858551622f9f75c73
 URL:		http://fedorahosted.org/koji
 BuildRequires:	python
 BuildRequires:	python-modules
@@ -37,6 +24,9 @@ Requires:	python-urlgrabber
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# TODO: change to libdir
+%define		_libexecdir	%{_prefix}/libexec
+
 %description
 Koji is a system for building and tracking RPMS. The base package
 contains shared libraries and the command-line interface.
@@ -49,6 +39,8 @@ pakiet zawiera biblioteki współdzielone i interfejs linii poleceń.
 Summary:	Koji XMLRPC interface
 Summary(pl.UTF-8):	Interfejs XMLRPC do Koji
 Group:		Applications/Networking
+# rpmdiff lib (from rpmlint) is GPLv2 (only)
+License:	LGPL v2 and GPL v2
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache-mod_alias
 Requires:	apache-mod_python
@@ -61,21 +53,33 @@ koji-hub is the XMLRPC interface to the Koji database.
 %description hub -l pl.UTF-8
 koji-hub to interfejs XMLRPC do bazy danych Koji.
 
+%package hub-plugins
+Summary:	Koji hub plugins
+Group:		Applications/Networking
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-hub = %{version}-%{release}
+
+%description hub-plugins
+Plugins to the koji XMLRPC interface
+
 %package builder
 Summary:	Koji RPM builder daemon
 Summary(pl.UTF-8):	Demon systemu Koji budujący pakiety RPM
+# mergerepos (from createrepo) is GPLv2+
+License:	LGPL v2 and GPL v2+
 Group:		Applications/System
 Requires(post):	/sbin/chkconfig
-Requires(post):	/sbin/service
 Requires(pre):	/usr/sbin/useradd
 Requires(preun):	/sbin/chkconfig
-Requires(preun):	/sbin/service
 Requires:	%{name} = %{version}-%{release}
 Requires:	/usr/bin/cvs
 Requires:	/usr/bin/git
 Requires:	/usr/bin/svn
-Requires:	createrepo >= 0.4.11
-#Requires:	mock >= 0.9.14
+Requires:	createrepo >= 0.9.6
+Requires:	mock >= 0.9.14
+Requires:	pycdio
+Requires:	python-cheetah
+Requires:	python-pykickstart
 Requires:	rpm-build
 
 %description builder
@@ -86,6 +90,26 @@ tasks that come through the Koji system.
 koji-builder to demon działający na maszynach budujących i wykonujący
 zadania przychodzące poprzez system Koji.
 
+%package vm
+Summary:	Koji virtual machine management daemon
+License:	LGPL v2
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires(post):	/sbin/chkconfig
+Requires(post):	/sbin/service
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
+Requires:	/usr/bin/virt-clone
+Requires:	libvirt-python
+Requires:	libxml2-python
+Requires:	qemu-img
+
+%description vm
+koji-vm contains a supplemental build daemon that executes certain
+tasks in a virtual machine.
+
+This package is not required for most installations.
+
 %package utils
 Summary:	Koji Utilities
 Summary(pl.UTF-8):	Narzędzia Koji
@@ -107,7 +131,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	apache-mod_auth_kerb
 Requires:	apache-mod_authz_host
 Requires:	apache-mod_mime
-Requires:	apache-mod_python
+Requires:	apache-mod_wsgi
 Requires:	python-PyGreSQL
 Requires:	python-cheetah
 #Requires:	python-krbV >= 1.0.13
@@ -148,6 +172,15 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del kojid
 fi
 
+%post vm
+/sbin/chkconfig --add kojivmd
+
+%preun vm
+if [ $1 = 0 ]; then
+	/sbin/chkconfig --del kojivmd
+	%service kojivmd stop
+fi
+
 %post utils
 /sbin/chkconfig --add kojira
 %service kojira restart
@@ -163,33 +196,62 @@ fi
 %doc docs Authors COPYING
 %attr(755,root,root) %{_bindir}/*
 %{py_sitescriptdir}/%{name}
-%config(noreplace) %{_sysconfdir}/koji.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/koji.conf
 
 %files hub
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/webapps.d/kojihub.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/koji-hub/hub.conf
 %{_datadir}/koji-hub
-%config(noreplace) %{_sysconfdir}/httpd/webapps.d/kojihub.conf
+%dir %{_libexecdir}/koji-hub
+%attr(755,root,root) %{_libexecdir}/koji-hub/rpmdiff
+
+%files hub-plugins
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/koji-hub/plugins
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/koji-hub/plugins/messagebus.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/koji-hub/plugins/rpm2maven.conf
+%dir %{_prefix}/lib/koji-hub-plugins
+%{_prefix}/lib/koji-hub-plugins/*.py*
+
+%files vm
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/kojivmd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kojivmd/kojivmd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kojivmd
+%attr(755,root,root) %{_sbindir}/kojivmd
+%{_datadir}/kojivmd
+%attr(754,root,root) /etc/rc.d/init.d/kojivmd
 
 %files utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/kojira
-%attr(754,root,root) /etc/rc.d/init.d/kojira
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kojira
 %dir %{_sysconfdir}/kojira
-%config(noreplace) %{_sysconfdir}/kojira/kojira.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kojira/kojira.conf
+%dir %{_sysconfdir}/koji-gc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/koji-gc/koji-gc.conf
+%dir %{_sysconfdir}/koji-shadow
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/koji-shadow/koji-shadow.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kojira
+%attr(754,root,root) /etc/rc.d/init.d/kojira
+%attr(755,root,root) %{_sbindir}/koji-gc
+%attr(755,root,root) %{_sbindir}/kojira
+%attr(755,root,root) %{_sbindir}/koji-shadow
 
 %files web
 %defattr(644,root,root,755)
 %{_datadir}/koji-web
 %dir %{_sysconfdir}/kojiweb
-%config(noreplace) %{_sysconfdir}/httpd/webapps.d/kojiweb.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kojiweb/web.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/webapps.d/kojiweb.conf
 
 %files builder
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/kojid
-%attr(754,root,root) /etc/rc.d/init.d/kojid
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kojid
 %dir %{_sysconfdir}/kojid
-%config(noreplace) %{_sysconfdir}/kojid/kojid.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kojid/kojid.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kojid
+%attr(754,root,root) /etc/rc.d/init.d/kojid
+%attr(755,root,root) %{_sbindir}/kojid
+%dir %{_libexecdir}/kojid
+%attr(755,root,root) %{_libexecdir}/kojid/mergerepos
 # TODO: kill -
 %attr(-,kojibuilder,kojibuilder) %{_sysconfdir}/mock/koji
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/koji.git/commitdiff/5ce61a5694be95ee69d40dd3b1ababed3a58aeb7

More information about the pld-cvs-commit mailing list