From 771783bfd5fa09867e9e32dbbe083c5e7e3927ee Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Nov 20 2009 19:29:57 +0000 Subject: update to 1.3.2 --- diff --git a/.cvsignore b/.cvsignore index 6f88394..f9e0cd7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -koji-1.3.1.tar.bz2 +koji-1.3.2.tar.bz2 diff --git a/koji.spec b/koji.spec index 28894fa..70853c1 100644 --- a/koji.spec +++ b/koji.spec @@ -1,21 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define baserelease 2 -#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) -%else -%define release %{baserelease} -%endif Name: koji -Version: 1.3.1 -Release: %{release}%{?dist} +Version: 1.3.2 +Release: 1%{?dist} License: LGPLv2 Summary: Build system tools Group: Applications/System URL: http://fedorahosted.org/koji Patch0: fedora-config.patch -Source: https://fedorahosted.org/koji/attachment/wiki/KojiRelease/%{name}-%{PACKAGE_VERSION}.tar.bz2 +Source: https://fedorahosted.org/koji/attachment/wiki/KojiRelease/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python-krbV >= 1.0.13 @@ -31,6 +24,8 @@ contains shared libraries and the command-line interface. %package hub Summary: Koji XMLRPC interface Group: Applications/Internet +License: LGPLv2 and GPLv2 +# rpmdiff lib (from rpmlint) is GPLv2 (only) Requires: httpd Requires: mod_python Requires: postgresql-python @@ -39,6 +34,15 @@ Requires: %{name} = %{version}-%{release} %description hub koji-hub is the XMLRPC interface to the koji database +%package hub-plugins +Summary: Koji hub plugins +Group: Applications/Internet +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 Group: Applications/System @@ -54,12 +58,15 @@ Requires: /usr/bin/svn Requires: /usr/bin/git Requires: rpm-build Requires: redhat-rpm-config +Requires: pykickstart +Requires: pycdio %if 0%{?fedora} Requires: createrepo >= 0.9.6 %endif %if 0%{?rhel} Requires: python-createrepo >= 0.9.6 Requires: python-hashlib +Requires: createrepo %endif %description builder @@ -116,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/httpd/conf.d/kojihub.conf %config(noreplace) %{_sysconfdir}/koji-hub/hub.conf +%files hub-plugins +%defattr(-,root,root) +%dir %{_prefix}/lib/koji-hub-plugins +%{_prefix}/lib/koji-hub-plugins/*.py* + %files utils %defattr(-,root,root) %{_sbindir}/kojira @@ -169,6 +181,12 @@ if [ $1 = 0 ]; then fi %changelog +* Fri Nov 20 2009 Dennis Gilmore - 1.3.2-1 +- update to 1.3.2 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index cf3e757..a72961d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -431044ff0bd4b34c552a74d4ae814c73 koji-1.3.1.tar.bz2 +c776f838f126276269e4bba2c2cea097 koji-1.3.2.tar.bz2