From 0573e2639cb47f261a3b1d5830bb9a23c1c3ac71 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Feb 2009 04:52:49 +0000 Subject: [PATCH] update to 1.3.0 --- .cvsignore | 2 +- koji.spec | 26 ++++++++++++++------------ sources | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2d10bca..433ab82 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -koji-1.2.6.tar.bz2 +koji-1.3.0.tar.bz2 diff --git a/koji.spec b/koji.spec index a05a1fd..68211dc 100644 --- a/koji.spec +++ b/koji.spec @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define baserelease 2 +%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,7 +8,7 @@ %define release %{baserelease} %endif Name: koji -Version: 1.2.6 +Version: 1.3.0 Release: %{release}%{?dist} License: LGPLv2 Summary: Build system tools @@ -43,7 +43,7 @@ koji-hub is the XMLRPC interface to the koji database Summary: Koji RPM builder daemon Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: mock >= 0.8.7 +Requires: mock >= 0.9.14 Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -54,14 +54,7 @@ Requires: /usr/bin/svn Requires: /usr/bin/git Requires: rpm-build Requires: redhat-rpm-config -%if 0%{?rhel} >= 5 -Requires: createrepo >= 0.4.11-2 -%endif -%if 0%{?fedora} >= 9 -Requires: createrepo >= 0.9.2 -%else -Requires: createrepo >= 0.4.11-2 -%endif +Requires: createrepo >= 0.9.6 %description builder koji-builder is the daemon that runs on build machines and executes @@ -113,18 +106,22 @@ rm -rf $RPM_BUILD_ROOT %files hub %defattr(-,root,root) %{_datadir}/koji-hub -%config(noreplace) /etc/httpd/conf.d/kojihub.conf +%{_libexecdir}/koji-hub/ +%config(noreplace) %{_sysconfdir}/httpd/conf.d/kojihub.conf +%config(noreplace) %{_sysconfdir}/koji-hub/hub.conf %files utils %defattr(-,root,root) %{_sbindir}/kojira %{_sbindir}/koji-gc +%{_sbindir}/koji-shadow %{_initrddir}/kojira %config(noreplace) %{_sysconfdir}/sysconfig/kojira %dir %{_sysconfdir}/kojira %config(noreplace) %{_sysconfdir}/kojira/kojira.conf %dir %{_sysconfdir}/koji-gc %config(noreplace) %{_sysconfdir}/koji-gc/koji-gc.conf +%config(noreplace) %{_sysconfdir}/koji-shadow/koji-shadow.conf %files web %defattr(-,root,root) @@ -136,6 +133,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_sbindir}/kojid %{_initrddir}/kojid +%{_libexecdir}/kojid/ +%{_datadir}/koji-builder %config(noreplace) %{_sysconfdir}/sysconfig/kojid %dir %{_sysconfdir}/kojid %config(noreplace) %{_sysconfdir}/kojid/kojid.conf @@ -164,6 +163,9 @@ if [ $1 = 0 ]; then fi %changelog +* Wed Feb 18 2009 Dennis Gilmore - 1.3.0-1 +- update to 1.3.0 + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.2.6-2 - Rebuild for Python 2.6 diff --git a/sources b/sources index c03cdf5..1d1d9a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11fd77f4e2951363277d64ed1e005809 koji-1.2.6.tar.bz2 +97c8625dd708b25758027c782eaffdda koji-1.3.0.tar.bz2