--- rpms/plague/contribs8/plague.spec 2008/04/02 15:22:03 1.3 +++ rpms/plague/contribs8/plague.spec 2008/09/08 13:54:04 1.5 @@ -1,43 +1,31 @@ -# $Id: plague.spec,v 1.2 2008/04/02 15:12:56 slords Exp $ -# Authority: slords -# Name: Shad L. Lords - BuildArch: noarch Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4.1 -Release: 10%{?dist} -License: GPL +Version: 0.4.5.4 +Release: 1%{?dist}.1 +License: GPLv2+ Group: Development/Tools -Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 +#Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 +Patch0: plague-0.4.5.4-pushscript-extras.patch URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: createrepo >= 0.4.3 +BuildRequires: python +Requires: createrepo >= 0.4.7 +# get the version of the sqlite api thats available to us +%if 0%{?rhel} +Requires: python-sqlite +%else +Requires: python-sqlite2 +%endif + Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Patch0: plague-0.4-daemonize.patch -Patch1: plague-0.4-py25.patch -Patch2: plague-0.4.4.1-authed.patch -Patch3: plague-0.4.4.1-srpm-umask.patch -Patch4: plague-0.4.4.1-etc.patch -Patch5: plague-0.4.4.1-pause.patch -Patch6: plague-0.4.4.1-racecondition.patch -Patch7: plague-0.4.4.1-preperrormsg.patch -Patch8: plague-0.4.4.1-kill.patch -Patch9: plague-0.4.4.1-mock-0.8.patch -Patch10: plague-0.4.4.1-update-builders.patch -Patch11: plague-0.4.4.1-filedownloader.patch -Patch12: plague-0.4.4.1-faster-downloads.patch -Patch13: plague-0.4.4.1-buildsys-fixes.patch -Patch14: plague-0.4.4.1-repolock.patch -Patch15: plague-0.4.4.1-repoadd.patch -Patch100: plague-0.4.4.1-pushscript-extras.patch - %description The Plague build system is a client/server distributed build system for @@ -50,14 +38,16 @@ Group: Development/Tools Requires: pyOpenSSL %description common -This package includes the common Python module that all Plague services require. +This package includes the common Python module that all Plague services +require. %package builder Summary: Builder daemon for Plague builder slaves Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: yum >= 2.2.1, mock >= 0.8 +Requires: yum >= 2.2.1 +Requires: mock >= 0.8 Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -73,13 +63,15 @@ Group: Development/Tools Requires: %{name}-common = %{version}-%{release} %description client -Client program for enqueueing package builds and interrogating the build system. +Client program for enqueueing package builds and interrogating the build +system. %package utils Summary: Utility programs for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description utils This package includes user utilities for the Plague build system, including @@ -88,23 +80,8 @@ the interface to the build server. %prep %setup -q -%patch0 -p0 -b .umask -%patch1 -p1 -b .py25 -%patch2 -p1 -b .authed -%patch3 -p1 -b .srpm-umask -%patch4 -p1 -b .etc -%patch5 -p1 -b .pause -%patch6 -p1 -b .racecondition -%patch7 -p1 -b .preperrormsg -%patch8 -p1 -b .kill -%patch9 -p1 -b .mock8 -%patch10 -p1 -b .update-builders -%patch11 -p1 -b .filedownloader -%patch12 -p1 -b .faster-downloads -%patch13 -p1 -b .buildsys-fixes -%patch14 -p1 -b .repolock -%patch15 -p1 -b .repoadd -%patch100 -p1 -b .pushscript-extras +%patch0 -p1 -b .extras +find www -name \*.extras | xargs rm %build @@ -113,12 +90,13 @@ make %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder -install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder -install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server -install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server -mkdir -p $RPM_BUILD_ROOT/srv/plague_builder +make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install +chmod +x $RPM_BUILD_ROOT%{_bindir}/* +install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder +install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder +install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server +install -p -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server +mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder %clean @@ -136,7 +114,7 @@ if [ $1 = 0 ]; then fi %pre builder -/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || : +/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /var/lib/plague/builder plague-builder 2>/dev/null || : %post builder /sbin/chkconfig --add plague-builder @@ -157,6 +135,7 @@ fi %dir %{_sysconfdir}/%{name}/server/certs %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server %{_initrddir}/%{name}-server +%doc www %files common %defattr(-, root, root) @@ -175,7 +154,8 @@ fi %dir %{_sysconfdir}/%{name}/builder/certs %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder %{_initrddir}/%{name}-builder -%attr(0755, plague-builder, plague-builder) /srv/plague_builder +%dir /var/lib/plague +%attr(0755, plague-builder, plague-builder) /var/lib/plague/builder %files client %defattr(-, root, root) @@ -183,30 +163,43 @@ fi %files utils %defattr(-, root, root) -%{_bindir}/%{name}-user-manager.py* -%{_bindir}/%{name}-certhelper.py* +%{_bindir}/%{name}-user-manager +%{_bindir}/%{name}-certhelper %changelog -* Fri Jan 18 2008 Michael Schwendt - 0.4.4.1-10.el5 -- Patch add_to_repo stage. - -* Wed Jan 9 2008 Michael Schwendt - 0.4.4.1-9.el5 -- Updated etc/ patch. +* Sun Sep 7 2008 Michael Schwendt - 0.4.5.4-1.extras +- update to 0.4.5.4 and update pushscript-extras patch -* Sat Jan 5 2008 Michael Schwendt - 0.4.4.1-8.el5 -- Add patches: repolock, filedownloader, faster downloads -- Merged post-0.4.4.1 patches from buildsys.fedoraproject.org server -- Merge the jobs db cleanup (in this form it is specific to Extras/EPEL - buildsys and disables the "finish" command) +* Sun Sep 7 2008 Michael Schwendt - 0.4.5.3-2.extras +- add the optional pushscript-extras patch +- fix mod_user in plague-user-manager for sqlite2/3 + +* Fri Sep 5 2008 Michael Schwendt - 0.4.5.3-1 +- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora +- merge fedora pkg spec changes +- include the www tree as server pkg docs + +* Thu Sep 04 2008 Dennis Gilmore - 0.4.5.2-1 +- fix bug in find option to plague-user-manager + +* Wed Sep 03 2008 Dennis Gilmore - 0.4.5.1-1 +- update to 0.4.5.1 applying Michael schwendt's logging and mock patches +- using pysqlite2 on fedora and python-sqlite on RHEL +- requires mock > 0.8 +- requires createrepo >= 0.4.7 + +* Wed Sep 3 2008 Michael Schwendt - 0.4.5-2 +- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail) +- merge more spec changes -* Wed Dec 26 2007 Michael Schwendt - 0.4.4.1-7.el5 -- Fix update_builders command for non-admin users. +* Tue Sep 02 2008 Dennis Gilmore - 0.4.5-1 +- update to 0.4.5 lots of fixes -* Wed Nov 14 2007 Michael Schwendt - 0.4.4.1-6.el5 -- Add patches for bug-fixes and mock 0.8 support. +* Thu May 22 2008 Seth Vidal - 0.4.4.1-6 +- licensing tag fix -* Tue Sep 18 2007 Michael Schwendt - 0.4.4.1-5 +* Tue Sep 18 2007 Michael Schwendt - 0.4.4.1-5 - Add dirs /etc/plague and /usr/share/plague to plague-common since "plague-builder" and "plague" use them (#233904). @@ -373,7 +366,7 @@ fi * Sat Jul 16 2005 Dan Williams - Bump version to 0.2 -- Grab python files from /usr/lib, not %{_libdir} until the +- Grab python files from /usr/lib, not %%{_libdir} until the multiarch issues get worked out * Sun Jun 26 2005 Dan Williams