/[smecontribs]/rpms/plague/contribs8/plague.spec

Diff of /rpms/plague/contribs8/plague.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.2 by slords,
Wed Apr  2 15:12:56 2008 UTC
+Revision 1.7 by slords,
Mon Oct  6 00:17:17 2008 UTC
 Line 1
- # $Id$
+ # $Id: plague.spec,v 1.6 2008/09/09 20:10:09 slords Exp $
- # # Authority: slords
+ # Authority: slords
  # Name: Shad L. Lords
  BuildArch: noarch
  Summary: Distributed build system for RPMs
  Name: plague
- Version: 0.4.4.1
+ Version: 0.4.5.6
- Release: 10%{?dist}
+ Release: 1%{?dist}.1
- License: GPL
+ 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
-Line 50 
 Group: Development/Tools
+Line 42 
 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
-Line 73 
 Group: Development/Tools
+Line 67 
 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
-Line 88 
 the interface to the build server.
+Line 84 
 the interface to the build server.
  %prep
  %setup -q
- %patch0 -p0 -b .umask
+ %patch0 -p1
- %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
  %build
-Line 113 
 make
+Line 93 
 make
  %install
  rm -rf $RPM_BUILD_ROOT
- make DESTDIR=$RPM_BUILD_ROOT install
+ make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
- install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
+ chmod +x $RPM_BUILD_ROOT%{_bindir}/*
- install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+ install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
- install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+ install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
- install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
+ install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
- mkdir -p $RPM_BUILD_ROOT/srv/plague_builder
+ 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
-Line 136 
 if [ $1 = 0 ]; then
+Line 117 
 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
-Line 157 
 fi
+Line 138 
 fi
  %dir %{_sysconfdir}/%{name}/server/certs
  %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
  %{_initrddir}/%{name}-server
+ %doc www
  %files common
  %defattr(-, root, root)
-Line 175 
 fi
+Line 157 
 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)
-Line 183 
 fi
+Line 166 
 fi
  %files utils
  %defattr(-, root, root)
- %{_bindir}/%{name}-user-manager.py*
+ %{_bindir}/%{name}-user-manager
- %{_bindir}/%{name}-certhelper.py*
+ %{_bindir}/%{name}-certhelper
  %changelog
- * Fri Jan 18 2008 Michael Schwendt <mschwendt@users.sf.net> - 0.4.4.1-10.el5
+ * Sun Oct  5 2008 Shad L. Lords <slords@mail.com> - 0.4.5.6-1.1
- - Patch add_to_repo stage.
+ - add the optional pushscript-extras patch
+ * Sun Sep 21 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4.5.6-1
+ - update to 0.4.5.6
+ * Sat Sep 20 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4.5.5-2
+ - add fix for sqlite's limited ALTER TABLE
+ * Mon Sep  8 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4.5.5-1
+ - update to 0.4.5.5
+ * Sun Sep 07 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4.5.4-1
+ - update to 0.4.5.4 to make it work with MySQL 5
+ * Sun Sep  7 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4.5.3-2
+ - fix mod_user in plague-user-manager for sqlite2/3
+ * Fri Sep  5 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 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 <dennis@ausil.us> - 0.4.5.2-1
+ - fix bug in find option to plague-user-manager
- * Wed Jan  9 2008 Michael Schwendt <mschwendt@users.sf.net> - 0.4.4.1-9.el5
+ * Wed Sep 03 2008 Dennis Gilmore <dennis@ausil.us> - 0.4.5.1-1
- - Updated etc/ patch.
+ - 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
- * Sat Jan  5 2008 Michael Schwendt <mschwendt@users.sf.net> - 0.4.4.1-8.el5
+ * Wed Sep  3 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4.5-2
- - Add patches: repolock, filedownloader, faster downloads
+ - add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
- - Merged post-0.4.4.1 patches from buildsys.fedoraproject.org server
+ - merge more spec changes
- - Merge the jobs db cleanup (in this form it is specific to Extras/EPEL
-   buildsys and disables the "finish" command)
- * Wed Dec 26 2007 Michael Schwendt <mschwendt@users.sf.net> - 0.4.4.1-7.el5
+ * Tue Sep 02 2008 Dennis Gilmore <dennis@ausil.us> - 0.4.5-1
- - Fix update_builders command for non-admin users.
+ - update to 0.4.5  lots of fixes
- * Wed Nov 14 2007 Michael Schwendt <mschwendt@users.sf.net> - 0.4.4.1-6.el5
+ * Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
- - Add patches for bug-fixes and mock 0.8 support.
+ - licensing tag fix
- * Tue Sep 18 2007 Michael Schwendt <mschwendt@users.sf.net> - 0.4.4.1-5
+ * Tue Sep 18 2007 Michael Schwendt <mschwendt@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).
-Line 373 
 fi
+Line 380 
 fi
  * Sat Jul 16 2005 Dan Williams <dcbw@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@redhat.com>

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1