- rebuild because tcl was bumped

Thu Dec 13 2007 Garrick Staples <garrick@usc.edu> 2.1.10-2
- fix multilib conflicts

pbs-config-multilib

@@ -0,0 +1,103 @@
+#! /bin/sh
+ 
+package="pbs"
+version="2.1.8"
+ 
+prefix="/usr"
+exec_prefix="/usr"
+bindir="/usr/bin"
+sbindir="/usr/sbin"
+libexecdir="/usr/libexec"
+datadir="/usr/share"
+sysconfdir="/etc"
+sharedstatedir="/usr/com"
+localstatedir="/var"
+infodir="/usr/share/info"
+mandir="/usr/share/man"
+includedir="/usr/include/torque"
+libs="-ltorque"
+ 
+if test "$#" -eq 0; then
+   cat <<EOF
+Usage: $package-config OPTIONS
+Options:
+  --prefix=DIR) : \$prefix
+  --package) : \$package
+  --version) : \$version
+  --cflags) : -I\$includedir
+  --libs) : \$libs
+  --help) print all the options (not just these)
+EOF
+fi
+ 
+o=""
+h=""
+for i in "$@"; do
+  case $i in
+  --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;
+  --prefix)    o="$o $prefix" ;;
+  --package)   o="$o $package" ;;
+  --version)   o="$o $version" ;;
+  --cflags) if test "_$includedir" != "_/usr/include"
+          then o="$o -I$includedir" ; fi
+  ;;
+  --libs)                  o="$o $libs" ;;
+  --exec_prefix|--eprefix) o="$o $exec_prefix" ;;
+  --bindir)                o="$o $bindir" ;;
+  --sbindir)               o="$o $sbindir" ;;
+  --libexecdir)            o="$o $libexecdir" ;;
+  --datadir)               o="$o $datadir" ;;
+  --datainc)               o="$o -I$datadir" ;;
+  --datalib)               o="$o -L$datadir" ;;
+  --sysconfdir)            o="$o $sysconfdir" ;;
+  --sharedstatedir)        o="$o $sharedstatedir" ;;
+  --localstatedir)         o="$o $localstatedir" ;;
+  --infodir)               o="$o $infodir" ;;
+  --mandir)                o="$o $mandir" ;;
+  --includedir)            o="$o $includedir" ;;
+  --data)                  o="$o -I$datadir/$package" ;;
+  --pkgdatadir)            o="$o $datadir/$package" ;;
+  --pkgdatainc)            o="$o -I$datadir/$package" ;;
+  --pkgdatalib)            o="$o -L$datadir/$package" ;;
+  --pkglibinc)             o="$o -I$libinc/$package" ;;
+  --pkglibadd)             o="$o -L$libadd/$package" ;;
+  --pkgincludedir)         o="$o $includedir/$package" ;;
+  --help) h="1" ;;
+  -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*) 
+       v=`echo $i | sed -e s://:\$:g`
+       v=`eval "echo $v"` 
+       o="$o $v" ;; 
+  esac
+done
+ 
+o=`eval "echo $o"`
+o=`eval "echo $o"`
+eval "echo $o"
+ 
+if test ! -z "$h" ; then 
+cat <<EOF
+  --prefix=xxx)      (what is that for anyway?)
+  --prefix)         \$prefix        $prefix
+  --package)        \$package       $package
+  --version)        \$version       $version
+  --cflags)         -I\$includedir    unless it is /usr/include
+  --libs)           -l\$PACKAGE \$LIBS
+  --exec_prefix) or... 
+  --eprefix)        \$exec_prefix   $exec_prefix
+  --bindir)         \$bindir        $bindir
+  --sbindir)        \$sbindir       $sbindir
+  --libexecdir)     \$libexecdir    $libexecdir
+  --datadir)        \$datadir       $datadir
+  --sysconfdir)     \$sysconfdir    $sysconfdir
+  --sharedstatedir) \$sharedstatedir$sharedstatedir
+  --localstatedir)  \$localstatedir $localstatedir
+  --infodir)        \$infodir       $infodir
+  --mandir)         \$mandir        $mandir
+  --data)           -I\$datadir/\$package
+  --pkgdatadir)     \$datadir/\$package
+  --pkgincludedir)  \$includedir/\$package
+  --help)           generated by ac_create_generic_config.m4
+  -I//varname and other inc-targets like --pkgdatainc supported
+  -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd
+EOF
+fi

torque.spec

@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.10
 #%%define snap 200604251602
-%define release 1
+%define release 3
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@ 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/
@@ -120,7 +121,7 @@ This package holds just a few shared files and directories.
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
+%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
 
 %build
@@ -129,18 +130,20 @@ This package holds just a few shared files and directories.
   --with-sendmail=/usr/sbin/sendmail \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
+%__cp -vf pbs-config-neutered pbs-config
 %__make %{?_smp_mflags}
  
 
 
 %install
 %__rm -rf "$RPM_BUILD_ROOT"
-%__make DESTDIR=$RPM_BUILD_ROOT install
+%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 # 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}
+%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+touch -r pbs-config-neutered $RPM_BUILD_ROOT/%{_bindir}/pbs-config
 
 # install initscripts
 %__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
@@ -402,6 +405,12 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
 
 
 %changelog
+* Thu Jan  3 2008 Garrick Staples <garrick@usc.edu> 2.1.10-3
+- rebuild because tcl was bumped
+
+* Thu Dec 13 2007 Garrick Staples <garrick@usc.edu> 2.1.10-2
+- fix multilib conflicts
+
 * Wed Dec 12 2007 Garrick Staples <garrick@usc.edu> 2.1.10-1
 - bump to 2.1.10