- Remove own copy of pbs-config. #657027

pbs-config-multilib

@@ -1,103 +0,0 @@
-#! /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

@@ -76,7 +76,6 @@ Source3:     xpbsmon.desktop
 Source4:     xpbs.png
 Source5:     xpbsmon.png
 Source6:     README.Fedora
-Source7:     pbs-config-multilib
 Source8:     config
 # https://bugzilla.redhat.com/show_bug.cgi?id=528060
 Patch0:      torque-cond-touch.patch
@@ -338,7 +337,7 @@ DRMAA is "Distributed Resource Management Application API"
 %patch1 -p1
 %patch2 -p1
 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
-   %{SOURCE6} %{SOURCE7} %{SOURCE8} .
+   %{SOURCE6} %{SOURCE8} .
 # rm x bit on some documentation.
 chmod 644 torque.setup
 
@@ -351,7 +350,6 @@ CFLAGS="%{optflags} -Wno-overlength-strings"
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
 
-cp -vf pbs-config-multilib pbs-config
 make %{?_smp_mflags}
 
 for daemon in pbs_mom pbs_sched pbs_server
@@ -778,6 +776,7 @@ fi
 
 %changelog
 * Wed Dec 8 2010 Steve Traylen <steve.traylen@cern.ch> - 2.5.3-3
+- Remove own copy of pbs-config. #657027
 - Move man pages from doc subpackage to relavent sub package.
 - Enable drmaa support and add drmaa sub packages.