rpms/torque/FC-4 README-localhost, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torque.spec, 1.6, 1.7

[Garrick Staples (garrick)]

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6388

Modified Files:
	.cvsignore sources torque.spec 
Added Files:
	README-localhost 
Log Message:
* Thu Jun 22 2006 Garrick Staples <garrick at usc.edu> 2.1.1-3
- rebuild



--- NEW FILE README-localhost ---
To setup a basic single-node localhost-only batch system, install the
torque-server, torque-mom, and torque-scheduler packages, and do something like
this:

/sbin/chkconfig pbs_mom on
/sbin/chkconfig pbs_server on
/sbin/chkconfig pbs_sched on
/bin/hostname --long > %{torquehomedir}/server_priv/nodes
/bin/hostname --long > %{torquehomedir}/server_name
service pbs_server start
qmgr -c "s s scheduling=true"
qmgr -c "c q batch queue_type=execution"
qmgr -c "s q batch started=true"
qmgr -c "s q batch enabled=true"
qmgr -c "s q batch resources_default.nodes=1"
qmgr -c "s q batch resources_default.walltime=3600"
qmgr -c "s s default_queue=batch"
service pbs_mom restart
service pbs_sched restart



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 May 2006 21:58:50 -0000	1.5
+++ .cvsignore	22 Jun 2006 22:39:08 -0000	1.6
@@ -1 +1 @@
-torque-2.1.0p0.tar.gz
+torque-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 May 2006 21:58:50 -0000	1.5
+++ sources	22 Jun 2006 22:39:08 -0000	1.6
@@ -1 +1 @@
-4f18b56dbc01ba9a519709cc620d9eae  torque-2.1.0p0.tar.gz
+c3032a22a03be995946d7fe71e19c6ee  torque-2.1.1.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- torque.spec	13 May 2006 05:14:04 -0000	1.6
+++ torque.spec	22 Jun 2006 22:39:08 -0000	1.7
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.0p0
+%define version 2.1.1
 #%%define snap 200604251602
-%define release 2
+%define release 3
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -90,8 +90,8 @@
 Source3: xpbsmon.desktop
 Source4: xpbs.png
 Source5: xpbsmon.png
+Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -99,6 +99,7 @@
 Provides: pbs
 BuildRequires: desktop-file-utils
 Conflicts: pbspro, openpbs, openpbs-oscar
+Obsoletes: torque-localhost
 
 %if %use_tcl
 BuildRequires: tcl-devel
@@ -120,9 +121,8 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p0
 
-%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
+%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
 
 %build
@@ -194,7 +194,7 @@
 
 %files
 %defattr(-, root, root)
-%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt
+%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
 %{torquehomedir}/aux
@@ -350,45 +350,6 @@
 %endif
 
 
-%package localhost
-Group: Applications/System
-Summary: Installs and configures a minimal localhost-only batch queue system
-Requires(post): %{name}-mom %{name}-server %{name}-client %{name}-scheduler
-
-%description localhost
-%shared_description
-This package installs and configures a minimal localhost-only batch queue
-system.
-
-%files localhost
-%defattr(-, root, root)
-%pre localhost
-if [ -f %{torquehomedir}/server_priv/serverdb ];then
-   echo "This package wipes out the existing server configuration.  Remove" 1>&2
-   echo "%{torquehomedir}/server_priv/serverdb if you really want this." 1>&2
-   exit 1
-fi
-%post localhost
-/sbin/chkconfig pbs_mom on
-/sbin/chkconfig pbs_server on
-/sbin/chkconfig pbs_sched on
-/bin/hostname --long > %{torquehomedir}/server_priv/nodes
-/bin/hostname --long > %{torquehomedir}/server_name
-/bin/hostname --long > %{torquehomedir}/mom_priv/config
-pbs_server -t create
-qmgr -c "s s scheduling=true"
-qmgr -c "c q batch queue_type=execution"
-qmgr -c "s q batch started=true"
-qmgr -c "s q batch enabled=true"
-qmgr -c "s q batch resources_default.nodes=1"
-qmgr -c "s q batch resources_default.walltime=3600"
-qmgr -c "s s default_queue=batch"
-%{_initrddir}/pbs_mom restart
-%{_initrddir}/pbs_sched restart
-%{_initrddir}/pbs_server restart
-qmgr -c "s n `/bin/hostname --long` state=free" -e
-
-
 %package -n lib%{name}
 Summary: Run-time libs for programs which will use the %{name} library
 Group: Development/Libraries
@@ -425,6 +386,18 @@
 
 
 %changelog
+* Thu Jun 22 2006 Garrick Staples <garrick at usc.edu> 2.1.1-3
+- rebuild
+
+* Thu Jun 22 2006 Garrick Staples <garrick at usc.edu> 2.1.1-2
+- rebuild with added README-localhost
+
+* Thu Jun 22 2006 Garrick Staples <garrick at usc.edu> 2.1.1-1
+- bump to 2.1.1
+
+* Mon May 15 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-3
+- get rid of the annoying "localhost only" package
+
 * Fri May 12 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-2
 - fix pbs_server segfault when mom_job_sync is enabled