rpms/torque/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 torque.spec, 1.34, 1.35

Tom Callaway spot at fedoraproject.org
Wed Jun 2 15:14:37 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/torque/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4578

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
update to 2.4.8, drop static libs, cleanup spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/torque/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	13 Dec 2007 06:43:11 -0000	1.14
+++ .cvsignore	2 Jun 2010 15:14:37 -0000	1.15
@@ -1 +1 @@
-torque-2.1.10.tar.gz
+torque-2.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torque/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	13 Dec 2007 06:43:11 -0000	1.14
+++ sources	2 Jun 2010 15:14:37 -0000	1.15
@@ -1 +1 @@
-298e0ff61028efc74f050425aac79300  torque-2.1.10.tar.gz
+56170b7fce63fed9ed0cc83ee5bd3e3a  torque-2.4.8.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torque/devel/torque.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- torque.spec	27 Jul 2009 06:08:04 -0000	1.34
+++ torque.spec	2 Jun 2010 15:14:37 -0000	1.35
@@ -1,10 +1,3 @@
-
-# comment out snap if building a real release
-%define name torque
-%define version 2.1.10
-#%%define snap 200604251602
-%define release 8
-
 # The following options are supported:
 #   --with server_name=hostname
 #   --with homedir=directory
@@ -12,26 +5,22 @@
 #   --with[out] gui
 #   --with[out] tcl
 
-
 # Hrm, should we default to the name of the buildhost?  That seems only
 # slightly better than picking a hostname at random.  This is exactly the kind
 # of compile-time default that doesn't work well with distributable packages.
 # Let's force the issue with the non-sensical "localhost".
-#
+# 
 # Note that "localhost" doesn't actually work.  You must either define the
 # correct hostname here, pass '--with server_name=foo' to rpmbuild, or be sure
 # that $PBS_SERVER_HOME/server_name contains the correct hostname.
-%define server_name localhost
+%global server_name localhost
 
-# change as you wish
-%define use_rcp 0
-%define use_tcl 1
-%define build_gui 1
+%global use_rcp 0
+%global use_tcl 1
+%global build_gui 1
 
 # these are non-defaults, but fit better into most RPM-based systems
-%define torquehomedir %_localstatedir/torque
-
-
+%global torquehomedir %{_localstatedir}/torque
 
 # --with/--without processing
 # first, error if conflicting options are used
@@ -40,160 +29,241 @@
 %{?_with_gui: %{?_without_gui: %{error: both _with_gui and _without_gui}}}
 
 # did we find any --with options?
-%{?_with_rcp: %define use_rcp 1}
-%{?_with_tcl: %define use_tcl 1}
-%{?_with_gui: %define build_gui 1}
+%{?_with_rcp: %global use_rcp 1}
+%{?_with_tcl: %global use_tcl 1}
+%{?_with_gui: %global build_gui 1}
 
-%{?_with_server_name:%define server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_homedir:%define torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_server_name:%global server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_homedir:%global torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}
 
 # did we find any --without options?
-%{?_without_rcp: %define use_rcp 0}
-%{?_without_tcl: %define use_tcl 0}
-%{?_without_gui: %define build_gui 0}
+%{?_without_rcp: %global use_rcp 0}
+%{?_without_tcl: %global use_tcl 0}
+%{?_without_gui: %global build_gui 0}
 
 # Set up all options as disabled
-%define rcpflags    --with-rcp=/usr/bin/scp
-%define tclflags    --without-tcl
-%define guiflags    --disable-gui
+%global rcpflags    --with-rcp=/usr/bin/scp
+%global tclflags    --without-tcl
+%global guiflags    --disable-gui
 
 # Enable options that we want
-%if %use_rcp
-%define rcpflags    --with-rcp=mom_rcp
+%if %{use_rcp}
+%global rcpflags    --with-rcp=mom_rcp
 %endif
 
-%if %build_gui
-%define guiflags   --enable-gui
+%if %{build_gui}
+%global guiflags   --enable-gui
 %endif
 
-%if %use_tcl
-%if %build_gui
-%define tclflags    --with-tcl --with-tk
+%if %{use_tcl}
+%if %{build_gui}
+%global tclflags    --with-tcl --with-tk
 %else
-%define tclflags    --with-tcl --without-tk
+%global tclflags    --with-tcl --without-tk
 %endif
 %endif
 
 # finish up the configs...
-%define server_nameflags --with-default-server=%{server_name}
+%global server_nameflags --with-default-server=%{server_name}
+%global shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes.  \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n  %{server_nameflags}\\n  %{tclflags}\\n  %{guiflags}\\n  %{rcpflags}\\n")
 
-
-%define shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes.  \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n  %{server_nameflags}\\n  %{tclflags}\\n  %{guiflags}\\n  %{rcpflags}\\n")
-
-
-Summary: Tera-scale Open-source Resource and QUEue manager
-Name: %{name}
-Version: %{version}
-Release: %{?snap:0.%{release}.%{snap}cvs}%{!?snap:%{release}}%{?dist}
-Source: torque-%{version}%{?snap:-snap.%snap}.tar.gz
-Source2: xpbs.desktop
-Source3: xpbsmon.desktop
-Source4: xpbs.png
-Source5: xpbsmon.png
-Source6: README-localhost
-Source7: pbs-config-multilib
-License: OpenPBS
-Group: System Environment/Daemons
-URL: http://www.clusterresources.com/products/torque/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
-Requires(posttrans): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Conflicts: pbspro, openpbs, openpbs-oscar
-Obsoletes: torque-localhost
-
-Patch0: torque-2.1.10-NI_MAXSERV.patch
-
-%if %use_tcl
-BuildRequires: tcl-devel
+Name:			torque
+Version:		2.4.8
+Release:		1%{?dist}
+Summary:		Tera-scale Open-source Resource and QUEue manager
+Source0:		http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source2:		xpbs.desktop
+Source3:		xpbsmon.desktop
+Source4:		xpbs.png
+Source5:		xpbsmon.png
+Source6:		README-localhost
+Source7:		pbs-config-multilib
+License:		OpenPBS
+Group:			System Environment/Daemons
+URL:			http://www.clusterresources.com/products/torque/
+Provides:		pbs = %{version}-%{release}
+BuildRequires:		desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
+Conflicts:		pbspro, openpbs, openpbs-oscar
+Obsoletes:		torque-localhost
+%if %{use_tcl}
+BuildRequires:		tcl-devel
 %endif
-%if %build_gui
-BuildRequires: tk-devel
+%if %{build_gui}
+BuildRequires:		tk-devel
 %else
-Obsoletes: torque-gui
+Obsoletes:		torque-gui
 %endif
-%if ! %use_rcp
-Requires: openssh-clients
+%if ! %{use_rcp}
+Requires:		openssh-clients
 %endif
 
 %description
-%shared_description
+%{shared_description}
 This package holds just a few shared files and directories.
 
+%package		client
+Group:			Applications/System
+Summary:		Client part of TORQUE
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(posttrans):	/usr/sbin/alternatives
+Requires(preun):	/usr/sbin/alternatives
+Provides:		pbs-client = %{version}-%{release}
 
-%prep
-%setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch0 -p1
 
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%description client
+%{shared_description}
+This package holds the command-line client programs.
+
+%package docs
+Group: 			Documentation
+Summary:		Documentation files for TORQUE
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		pbs-docs = %{version}-%{release}
+
+%description docs
+%{shared_description}
+This package holds the documentation files.
+
+%package gui
+Group:			Applications/System
+Summary:		Graphical clients for TORQUE
+Requires:		%{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		xpbs = %{version}-%{release} 
+Provides:		xpbsmon = %{version}-%{release}
+Provides:		%{name}-x11tools = %{version}-%{release}
+
+%description gui
+%{shared_description}
+This package holds the graphical clients.
+
+%package -n lib%{name}
+Summary:		Run-time libs for programs which will use the %{name} library
+Group:			Development/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n lib%{name}
+%{shared_description}
+This package includes the shared libraries necessary for running TORQUE 
+programs.
+
+%package -n lib%{name}-devel
+Summary:		Development tools for programs which will use the %{name} library
+Group:			Development/Libraries
+Requires:		lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n lib%{name}-devel
+%{shared_description}
+This package includes the header files and static libraries
+necessary for developing programs which will use %{name}.
+
+%package mom
+Group:			System Environment/Daemons
+Summary:		Node execution daemon for TORQUE
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		pbs-mom = %{version}-%{release}
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+# This is for /sbin/service
+Requires(preun):	initscripts
+
+%description mom
+%{shared_description}
+This package holds the execute daemon required on every node.
+
+%package pam
+Summary:		PAM module for TORQUE MOM nodes
+Group:			System Environment/Base
+
+%description pam
+%{shared_description}
+A simple PAM module to authorize users on PBS MOM nodes with a running job.
+
+%package scheduler
+Group:			System Environment/Daemons
+Summary:		Simple fifo scheduler for TORQUE
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		pbs-scheduler = %{version}-%{release}
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+# This is for /sbin/service
+Requires(preun):	initscripts
+
+%description scheduler
+%{shared_description}
+This package holds the fifo C scheduler.
+
+%package server
+Group:			System Environment/Daemons
+Summary:		The main part of TORQUE
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		pbs-server = %{version}-%{release}
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+# This is for /sbin/service
+Requires(preun):	initscripts
 
+%description server
+%shared_description
+This package holds the server.
+
+%prep
+%setup -q -n torque-%{version}%{?snap:-snap.%snap}
+install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
 %build
+CFLAGS="%{optflags} -Wno-overlength-strings"
 %configure --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
-  --with-sendmail=/usr/sbin/sendmail \
+  --with-sendmail=%{_sbindir}/sendmail --disable-static \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
-%__cp -vf pbs-config-multilib pbs-config
-%__make %{?_smp_mflags}
- 
-
+cp -vf pbs-config-multilib pbs-config
+make %{?_smp_mflags}
 
 %install
-%__rm -rf "$RPM_BUILD_ROOT"
-%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 # remove files we don't need
-%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
-%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
-%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
-touch -r pbs-config-multilib $RPM_BUILD_ROOT/%{_bindir}/pbs-config
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*/buildindex
+rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la}
+mkdir -p %{buildroot}%{_bindir}
+touch -r pbs-config-multilib %{buildroot}%{_bindir}/pbs-config
 
 # install initscripts
-%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p %{buildroot}%{_initrddir}
 for daemon in pbs_mom pbs_sched pbs_server; do
-  %__sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
-         -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
-         -e 's|chkconfig: 345|chkconfig: -|' \
-        < contrib/init.d/$daemon > $RPM_BUILD_ROOT%{_initrddir}/$daemon
-  %__chmod 755 $RPM_BUILD_ROOT%{_initrddir}/$daemon
+  sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
+      -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
+      -e 's|chkconfig: 345|chkconfig: -|' \
+      < contrib/init.d/$daemon > %{buildroot}%{_initrddir}/$daemon
+  chmod 755 %{buildroot}%{_initrddir}/$daemon
 done
 
 %if %{build_gui}
 # This is really trivial, but cleans up an rpmlint warning
-%__sed -i -e 's|%_lib/../||' $RPM_BUILD_ROOT%{_bindir}/xpbs
+sed -i -e 's|%{_lib}/../||' %{buildroot}%{_bindir}/xpbs
 
 # install .desktop files and my ugly icons
-desktop-file-install --vendor fedora                   \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-        --add-category X-Fedora                        \
-        xpbs.desktop
-desktop-file-install --vendor fedora                   \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-        --add-category X-Fedora                        \
-        xpbsmon.desktop
-%__install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%__install -p -m0644 xpbs.png xpbsmon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
+desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbs.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbsmon.desktop
+install -d %{buildroot}%{_datadir}/pixmaps
+install -p -m0644 xpbs.png xpbsmon.png %{buildroot}%{_datadir}/pixmaps
 %endif
 
-
 # alternatives stuff
 for bin in qalter qdel qhold qrls qselect qstat qsub
 do
-    mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-torque
-    mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 \
-       $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-torque.1
+    mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/${bin}-torque
+    mv %{buildroot}%{_mandir}/man1/${bin}.1 \
+       %{buildroot}%{_mandir}/man1/${bin}-torque.1
 done
 
-
 %clean
-%__rm -rf "$RPM_BUILD_ROOT"
-
+rm -rf %{buildroot}
 
 %post
-if %__grep -q "PBS services" /etc/services;then
+if grep -q "PBS services" /etc/services;then
    : PBS services already installed
 else
    cat<<-__EOF__>>/etc/services
@@ -209,133 +279,6 @@ else
 	__EOF__
 fi
 
-
-%files
-%defattr(-, root, root)
-%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
-%config(noreplace) %{torquehomedir}/pbs_environment
-%config(noreplace) %{torquehomedir}/server_name
-%dir %{torquehomedir}
-%{torquehomedir}/aux
-%{torquehomedir}/spool
-
-
-%package docs
-Group: Documentation
-Summary: Documentation files for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-docs
-%description docs
-%shared_description
-This package holds the documentation files.
-
-%files docs
-%defattr(-, root, root)
-%doc doc/admin_guide.ps
-%{_mandir}/man*/*
-%exclude %{_mandir}/man1/qsub-torque.1.gz
-%exclude %{_mandir}/man1/qalter-torque.1.gz
-%exclude %{_mandir}/man1/qdel-torque.1.gz
-%exclude %{_mandir}/man1/qhold-torque.1.gz
-%exclude %{_mandir}/man1/qrls-torque.1.gz
-%exclude %{_mandir}/man1/qselect-torque.1.gz
-%exclude %{_mandir}/man1/qstat-torque.1.gz
-
-
-%package scheduler
-Group: System Environment/Daemons
-Summary: Simple fifo scheduler for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-scheduler
-%description scheduler
-%shared_description
-This package holds the fifo C scheduler.
-
-%files scheduler
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_sched
-%{_initrddir}/pbs_sched
-%dir %{torquehomedir}/sched_priv
-%config(noreplace) %{torquehomedir}/sched_priv/*
-%{torquehomedir}/sched_logs
-
-%post scheduler
-/sbin/chkconfig --add pbs_sched
-
-%preun scheduler
-if [ $1 -eq 0 ]; then
-   /sbin/service pbs_sched stop 
-   /sbin/chkconfig --del pbs_sched
-fi
-
-
-%package server
-Group: System Environment/Daemons
-Summary: The main part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-server
-%description server
-%shared_description
-This package holds the server.
-
-%files server
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_server
-%attr(0755, root, root) %{_sbindir}/momctl
-%{_initrddir}/pbs_server
-%{torquehomedir}/server_logs
-%{torquehomedir}/server_priv
-
-%post server
-/sbin/chkconfig --add pbs_server
-
-%preun server
-if [ $1 -eq 0 ]; then
-   /sbin/service pbs_server stop 
-   /sbin/chkconfig --del pbs_server
-fi
-
-
-%package mom
-Group: System Environment/Daemons
-Summary: Node execution daemon for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-mom
-%description mom
-%shared_description
-This package holds the execute daemon required on every node.
-
-%files mom
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_mom
-%{_initrddir}/pbs_mom
-%if %{use_rcp}
-%attr(4755 root root) %{_sbindir}/pbs_rcp
-%endif
-%{torquehomedir}/mom_priv
-%{torquehomedir}/mom_logs
-%{torquehomedir}/checkpoint
-%{torquehomedir}/undelivered
-
-%post mom
-/sbin/chkconfig --add pbs_mom
-
-%preun mom
-if [ $1 -eq 0 ]; then
-   /sbin/service pbs_mom stop 
-   /sbin/chkconfig --del pbs_mom
-fi
-
-
-%package client
-Group: Applications/System
-Summary: Client part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-client
-%description client
-%shared_description
-This package holds the command-line client programs.
-
 %posttrans client
 /usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
         --slave %{_mandir}/man1/qsub.1.gz qsub-man \
@@ -364,8 +307,47 @@ if [ $1 -eq 0 ]; then
   /usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
 fi
 
+%post -n lib%{name} -p /sbin/ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
+
+%post mom
+/sbin/chkconfig --add pbs_mom
+
+%preun mom
+if [ $1 -eq 0 ]; then
+   /sbin/service pbs_mom stop >/dev/null 2>&1
+   /sbin/chkconfig --del pbs_mom
+fi
+
+%post scheduler
+/sbin/chkconfig --add pbs_sched
+
+%preun scheduler
+if [ $1 -eq 0 ]; then
+   /sbin/service pbs_sched stop >/dev/null 2>&1
+   /sbin/chkconfig --del pbs_sched
+fi
+
+%post server
+/sbin/chkconfig --add pbs_server
+
+%preun server
+if [ $1 -eq 0 ]; then
+   /sbin/service pbs_server stop >/dev/null 2>&1
+   /sbin/chkconfig --del pbs_server
+fi
+
+%files
+%defattr(-, root, root, -)
+%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
+%config(noreplace) %{torquehomedir}/pbs_environment
+%config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
+%{torquehomedir}/aux
+%{torquehomedir}/spool
+
 %files client
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_bindir}/q*
 %{_bindir}/chk_tree
 %{_bindir}/hostn
@@ -373,11 +355,13 @@ fi
 %{_bindir}/pbsdsh
 %{_bindir}/pbsnodes
 %{_bindir}/printjob
+%{_bindir}/printserverdb
 %{_bindir}/printtracking
 %{_bindir}/tracejob
-%attr(4755 root root) %{_sbindir}/pbs_iff
+%{_sbindir}/momctl
+%attr(4755, root, root) %{_sbindir}/pbs_iff
 %{_sbindir}/pbs_demux
-%if %use_tcl
+%if %{use_tcl}
 %{_bindir}/pbs_tclsh
 %endif
 %{_mandir}/man1/qsub-torque.1.gz
@@ -388,21 +372,21 @@ fi
 %{_mandir}/man1/qselect-torque.1.gz
 %{_mandir}/man1/qstat-torque.1.gz
 
-
-%package gui
-Group: Applications/System
-Summary: Graphical clients for TORQUE
-Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: xpbs xpbsmon
-Provides: %{name}-x11tools
-%description gui
-%shared_description
-This package holds the graphical clients.
-
+%files docs
+%defattr(-, root, root, -)
+%doc doc/admin_guide.ps
+%{_mandir}/man*/*
+%exclude %{_mandir}/man1/qsub-torque.1.gz
+%exclude %{_mandir}/man1/qalter-torque.1.gz
+%exclude %{_mandir}/man1/qdel-torque.1.gz
+%exclude %{_mandir}/man1/qhold-torque.1.gz
+%exclude %{_mandir}/man1/qrls-torque.1.gz
+%exclude %{_mandir}/man1/qselect-torque.1.gz
+%exclude %{_mandir}/man1/qstat-torque.1.gz
 
 %if %{build_gui}
 %files gui
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_bindir}/pbs_wish
 %{_bindir}/xpbs
 %{_bindir}/xpbsmon
@@ -412,56 +396,60 @@ This package holds the graphical clients
 %{_datadir}/pixmaps/*.png
 %endif
 
-
-%package -n lib%{name}
-Summary: Run-time libs for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n lib%{name}
-%shared_description
-This package includes the shared libraries
-necessary for running TORQUE programs.
-
 %files -n lib%{name}
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_libdir}/*.so.*
 
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
-
-%package -n lib%{name}-devel
-Summary: Development tools for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n lib%{name}-devel
-%shared_description
-This package includes the header files and static libraries
-necessary for developing programs which will use %{name}.
-
 %files -n lib%{name}-devel
-%defattr(-, root, root)
-%{_libdir}/*.a
+%defattr(-, root, root, -)
 %{_libdir}/*.so
 %{_includedir}/torque
 %{_bindir}/pbs-config
 
-%package pam
-Summary: PAM module for TORQUE MOM nodes
-Group: System Environment/Base
-
-%description pam
-%shared_description
-A simple PAM module to authorize users on PBS MOM nodes with a running job.
+%files mom
+%defattr(-, root, root, -)
+%{_sbindir}/pbs_mom
+%{_sbindir}/qnoded
+%{_sbindir}/pbs_demux
+%{_bindir}/pbs_track
+%{_initrddir}/pbs_mom
+%if %{use_rcp}
+%attr(4755, root, root) %{_sbindir}/pbs_rcp
+%endif
+%{torquehomedir}/mom_priv/
+%{torquehomedir}/mom_logs
+%{torquehomedir}/checkpoint
+%{torquehomedir}/undelivered
 
 %files pam
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc src/pam/README.pam
 /%{_lib}/security/pam_pbssimpleauth.so
 
+%files scheduler
+%defattr(-, root, root, -)
+%attr(0755, root, root) %{_sbindir}/pbs_sched
+%{_sbindir}/qschedd
+%{_initrddir}/pbs_sched
+%dir %{torquehomedir}/sched_priv
+%config(noreplace) %{torquehomedir}/sched_priv/*
+%{torquehomedir}/sched_logs
+
+%files server
+%defattr(-, root, root, -)
+%attr(0755, root, root) %{_sbindir}/pbs_server
+%attr(0755, root, root) %{_sbindir}/momctl
+%{_sbindir}/qserverd
+%{_initrddir}/pbs_server
+%{torquehomedir}/server_logs
+%{torquehomedir}/server_priv
 
 %changelog
+* Wed Jun  2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.8-1
+- update to 2.4.8
+- drop static libs
+- cleanup spec file
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list