rpms/plague/EL-5 plague.spec, 1.28, 1.29 sources, 1.25, 1.26 plague-0.4-daemonize.patch, 1.1, NONE

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/plague/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5034

Modified Files:
	plague.spec sources 
Removed Files:
	plague-0.4-daemonize.patch 
Log Message:
update to 0.4.5.1



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/plague.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plague.spec	14 Sep 2006 16:13:05 -0000	1.28
+++ plague.spec	4 Sep 2008 02:28:03 -0000	1.29
@@ -2,21 +2,31 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.4.1
-Release: 2%{?dist}
-License: GPL
+Version: 0.4.5.1
+Release: 1%{?dist}
+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
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python-sqlite, 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
+
+
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -28,14 +38,16 @@
 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.3
+Requires: yum >= 2.2.1
+Requires: mock >= 0.8
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -51,7 +63,8 @@
 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
@@ -66,7 +79,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .umask
+
 
 %build
 make
@@ -74,12 +87,13 @@
 
 %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
@@ -97,7 +111,7 @@
 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
@@ -122,6 +136,8 @@
 %files common
 %defattr(-, root, root)
 %doc README ChangeLog
+%dir %{_sysconfdir}/%{name}
+%dir %{_datadir}/%{name}
 %dir /usr/lib/python?.?/site-packages/%{name}
 /usr/lib/python?.?/site-packages/%{name}/*.py*
 
@@ -134,7 +150,8 @@
 %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)
@@ -142,11 +159,38 @@
 
 %files utils
 %defattr(-, root, root)
-%{_bindir}/%{name}-user-manager.py*
-%{_bindir}/%{name}-certhelper.py*
+%{_bindir}/%{name}-user-manager
+%{_bindir}/%{name}-certhelper
 
 
 %changelog
+* Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 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 <mschwendt at fedoraproject.org> - 0.4.5-2
+- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
+- merge more spec changes
+
+* Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
+- update to 0.4.5  lots of fixes 
+
+* Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
+- licensing tag fix
+
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4.1-5
+- Add dirs /etc/plague and /usr/share/plague to plague-common
+  since "plague-builder" and "plague" use them (#233904).
+
+* Fri Dec 15 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.4.1-4
+- Small fix for a change in python 2.5's xmlrpc library.  The patch has been
+  upstreamed.
+
+* Thu Dec 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.4.1-3
+- Rebuild for new Python
+
 * Thu Sep 14 2006 Dennis Gilmore <dennis at ausil.us> 0.4.4.0-2
 - add patch  for bad umask setting
 
@@ -303,7 +347,7 @@
 
 * Sat Jul 16 2005 Dan Williams <dcbw at redhat.com>
 - 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 <dcbw at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 15:30:00 -0000	1.25
+++ sources	4 Sep 2008 02:28:03 -0000	1.26
@@ -1 +1 @@
-0eb43e25cdd8d630759d010115101956  plague-0.4.4.1.tar.bz2
+99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2


--- plague-0.4-daemonize.patch DELETED ---