From c9da86c7244f4fbd5eb2e6993cc0f541f86373c2 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick@fedoraproject.org>
Date: Tue, 1 Aug 2006 23:22:12 +0000
Subject: [PATCH] - bump to 2.1.2 - fix bz #200830 - enable new pam module

---
 .cvsignore  |  2 +-
 sources     |  2 +-
 torque.spec | 32 ++++++++++++++++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d0b57cb..4d02737 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.1.tar.gz
+torque-2.1.2.tar.gz
diff --git a/sources b/sources
index 6a370e4..e0099bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3032a22a03be995946d7fe71e19c6ee  torque-2.1.1.tar.gz
+f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
diff --git a/torque.spec b/torque.spec
index 4e2083c..3cfbf7e 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.1
+%define version 2.1.2
 #%%define snap 200604251602
-%define release 3
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -97,7 +97,7 @@ 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
+BuildRequires: desktop-file-utils, pam-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,12 +122,13 @@ This package holds just a few shared files and directories.
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
 
-%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
+%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
 
 %build
-%configure --includedir=%{_includedir}/torque --with-server-home=%{torquehomedir} \
- %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
+%configure --includedir=%{_includedir}/torque \
+  --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
+  %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
 %__make %{?_smp_mflags}
  
@@ -140,6 +141,7 @@ This package holds just a few shared files and directories.
 # 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}
 
 # install initscripts
 %__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
@@ -384,8 +386,26 @@ necessary for developing programs which will use %{name}.
 %{_includedir}/torque
 %{_bindir}/pbs-config
 
+%package pam
+Summary: PAM module for PBS 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 pam
+%defattr(-, root, root)
+%doc src/pam/README.pam
+/%{_lib}/security/pam_pbssimpleauth.so
+
 
 %changelog
+* Tue Aug  1 2006 Garrick Staples <garrick@usc.edu> 2.1.2-1
+- bump to 2.1.2
+- fix bz #200830
+- enable new pam module
+
 * Thu Jun 22 2006 Garrick Staples <garrick@usc.edu> 2.1.1-3
 - rebuild