[cap4-devel] [SCM] cap4 branch master updated. 53b26aecdbd7d52fbd0232753aa294718ad346c1

[Christopher D. M. <cas...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".

The branch, master has been updated
       via  53b26aecdbd7d52fbd0232753aa294718ad346c1 (commit)
      from  4178f45da0c038441b160e9514a2df9eecd14de9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 53b26aecdbd7d52fbd0232753aa294718ad346c1
Author: CDM <cas...@us...>
Date:   Tue Feb 28 10:28:18 2012 -0700

    CDM: fixes to make rpm|svnrpm|gitrpm work

-----------------------------------------------------------------------

Summary of changes:
 cap.spec   |   55 ++++++++++++++++++++++++-------------------------------
 install.sh |    4 ++--
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/cap.spec b/cap.spec
index 1899eb8..84453f9 100644
--- a/cap.spec
+++ b/cap.spec
@@ -23,10 +23,12 @@ Source0:      http://www.capforge.com/downloads/cap/%{name}-%{version}.tar.gz
 
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-build
-%define _cap_home /usr
-%define _capconf_home /etc
-%define _capdb_home /var/lib/cap
-%define _cap_workorder_home /var/spool/cap
+# if no cap_home passed in assume /opt/cap4
+%{!?_cap_home: %define _cap_home /opt/cap4}
+#-%define _capconf_home /etc
+#-%define _capdb_home /var/lib/cap
+#-%define _cap_workorder_home /var/spool/cap
+
 
 %description
 The Cluster Administration Package (CAP) is meant to ease integration, 
@@ -70,23 +72,14 @@ Authors:
 
 %pre
 
-#if pdsh -h 2>&1 | grep modules | grep exec ; then 
-#	echo pdsh exec available
-#else 
-#	echo pdsh exec not available
-#fi
-
-
 %prep
 %setup -q -n %{name}-%{version} 
 
 %build
-
-tools/build.sh ${RPM_BUILD_ROOT}
+./build.sh ${RPM_BUILD_ROOT}
 
 %install
-
-tools/install.sh ${RPM_BUILD_ROOT}
+./install.sh ${RPM_BUILD_ROOT}
 
 %post
 # workorder
@@ -126,23 +119,23 @@ echo "CAP workorder files may still be located in %{_cap_workorder_home}!"
 
 %files
 %defattr(-,root,root)
-%config(noreplace) %{_capconf_home}/sysconfig/cap
-%config(noreplace) %{_capconf_home}/profile.d/cap.csh
-%config(noreplace) %{_capconf_home}/profile.d/cap.sh
-%config(noreplace) %{_capconf_home}/cap/conf/cap.conf
-%config(noreplace) %{_capconf_home}/cap/conf.d/client_proxy.conf
-%config(noreplace) %{_capconf_home}/cap/conf.d/client_cache.conf
-%config(noreplace) %{_capconf_home}/cap/conf.d/workorder.conf
-%docdir %{_capconf_home}/share/doc/cap4
-%{_capconf_home}/rc.d/init.d/*
-%{_cap_home}/sbin/*
-%{_cap_home}/bin/*
-%{_cap_home}/include/cap/*
-%{_cap_home}/libexec/cap/*
-%{_cap_home}/share/man/man1/*
-%{_cap_home}/share/man/man3/*
+#%config(noreplace) %{_capconf_home}/sysconfig/cap
+#%config(noreplace) %{_capconf_home}/profile.d/cap.csh
+#%config(noreplace) %{_capconf_home}/profile.d/cap.sh
+#%config(noreplace) %{_capconf_home}/cap/conf/cap.conf
+#%config(noreplace) %{_capconf_home}/cap/conf.d/client_proxy.conf
+#%config(noreplace) %{_capconf_home}/cap/conf.d/client_cache.conf
+#%config(noreplace) %{_capconf_home}/cap/conf.d/workorder.conf
+#%docdir %{_capconf_home}/share/doc/cap4
+#%{_capconf_home}/rc.d/init.d/*
+#%{_cap_home}/sbin/*
+#%{_cap_home}/bin/*
+#%{_cap_home}/include/cap/*
+%{_cap_home}/libexec/toolbox/*
+#%{_cap_home}/share/man/man1/*
+#%{_cap_home}/share/man/man3/*
 #%{_capconf_home}/cap
-%{_cap_home}/share/doc/cap4/*
+%{_cap_home}/share/doc/*
 #%{_cap_workorder_home}
 
 #%files test
diff --git a/install.sh b/install.sh
index 44278b4..0d1a103 100755
--- a/install.sh
+++ b/install.sh
@@ -27,8 +27,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ############################################################################ 
 
-set -x
-pwd
+#set -x
+#pwd
 BUILD_ROOT=$1
 
 # place stuff in /opt/cap4 and softlink to it from standard space instead


hooks/post-receive
-- 
cap4