From d2e38ff95c486e8c4a1e49830e4d4d9a115d6a16 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 26 Aug 2008 00:20:24 +0000 Subject: [PATCH] update to 1.2.6 --- .cvsignore | 2 +- koji.spec | 17 +++++++++++++---- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ca911b..2d10bca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -koji-1.2.5.tar.bz2 +koji-1.2.6.tar.bz2 diff --git a/koji.spec b/koji.spec index 1a5ee8f..5d3c3a7 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.5 +Version: 1.2.6 Release: %{release}%{?dist} License: LGPLv2 Summary: Build system tools @@ -59,6 +59,8 @@ Requires: createrepo >= 0.4.11-2 %endif %if 0%{?fedora} >= 9 Requires: createrepo >= 0.9.2 +%else +Requires: createrepo >= 0.4.11-2 %endif %description builder @@ -116,10 +118,13 @@ rm -rf $RPM_BUILD_ROOT %files utils %defattr(-,root,root) %{_sbindir}/kojira +%{_sbindir}/koji-gc %{_initrddir}/kojira %config(noreplace) %{_sysconfdir}/sysconfig/kojira -%{_sysconfdir}/kojira +%dir %{_sysconfdir}/kojira %config(noreplace) %{_sysconfdir}/kojira/kojira.conf +%dir %{_sysconfdir}/koji-gc +%config(noreplace) %{_sysconfdir}/koji-gc/koji-gc.conf %files web %defattr(-,root,root) @@ -132,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/kojid %{_initrddir}/kojid %config(noreplace) %{_sysconfdir}/sysconfig/kojid -%{_sysconfdir}/kojid +%dir %{_sysconfdir}/kojid %config(noreplace) %{_sysconfdir}/kojid/kojid.conf %attr(-,kojibuilder,kojibuilder) /etc/mock/koji @@ -159,6 +164,10 @@ if [ $1 = 0 ]; then fi %changelog +* Mon Aug 25 2008 Dennis Gilmore - 1.2.6-1 +- update to 1.2.6 +- make sure we have to correct version of createrepo on Fedora 8 + * Tue Aug 5 2008 Tom "spot" Callaway 1.2.5-2 - fix conditional (line 5) - fix license tag diff --git a/sources b/sources index bff65c2..c03cdf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6be9cfcd5698ee4c29666eedbbcfb346 koji-1.2.5.tar.bz2 +11fd77f4e2951363277d64ed1e005809 koji-1.2.6.tar.bz2