diff --git a/Makefile b/Makefile index fcd4dca1..83a3058c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME=koji SPECFILE = $(firstword $(wildcard *.spec)) -SUBDIRS = hub builder koji cli docs util www +SUBDIRS = hub builder koji cli docs util www plugins ifdef DIST DIST_DEFINES := --define "dist $(DIST)" diff --git a/koji.spec b/koji.spec index 8fb2f8e8..6eada73b 100644 --- a/koji.spec +++ b/koji.spec @@ -8,7 +8,7 @@ %define release %{baserelease} %endif Name: koji -Version: 1.3.1 +Version: 1.3.2 Release: %{release}%{?dist} License: LGPLv2 and GPLv2+ # koji.ssl libs (from plague) are GPLv2+ @@ -41,6 +41,16 @@ 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 +License: LGPLv2 +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 @@ -123,6 +133,11 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/httpd/conf.d/kojihub.conf %config(noreplace) /etc/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 @@ -178,6 +193,10 @@ if [ $1 = 0 ]; then fi %changelog +* Tue Nov 10 2009 Mike Bonnet - 1.3.2-1 +- support for LiveCD creation +- new event-based callback system + * Fri Feb 20 2009 Mike McLean 1.3.1-1 - external repo urls rewritten to end with / - add schema file for upgrades from 1.2.x to 1.3 diff --git a/plugins/Makefile b/plugins/Makefile new file mode 100644 index 00000000..730c718e --- /dev/null +++ b/plugins/Makefile @@ -0,0 +1,20 @@ +PYTHON=python +PLUGINDIR = /usr/lib/koji-hub-plugins +FILES = $(wildcard *.py) + +_default: + @echo "nothing to make. try make install" + +clean: + rm -f *.o *.so *.pyc *.pyo *~ + +install: + @if [ "$(DESTDIR)" = "" ]; then \ + echo " "; \ + echo "ERROR: A destdir is required"; \ + exit 1; \ + fi + + mkdir -p $(DESTDIR)/$(PLUGINDIR) + install -p -m 644 $(FILES) $(DESTDIR)/$(PLUGINDIR) + $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PLUGINDIR)', 1, '$(PLUGINDIR)', 1)"