[condor/f18: 36/37] 7.9.5-0.3

[tstclair]

commit 00bb898272e6656af9ff5d827bbd81114c8a16bd
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Mar 8 10:50:37 2013 -0600

    7.9.5-0.3

 condor.spec |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/condor.spec b/condor.spec
index b96f0ce..6368f94 100644
--- a/condor.spec
+++ b/condor.spec
@@ -29,11 +29,11 @@
 # Things not turned on, or don't have Fedora packages yet
 %define blahp 1
 %define glexec 1
-%define cream 1
+%define cream 0
 
 # These flags are meant for developers; it allows one to build Condor
 # based upon a git-derived tarball, instead of an upstream release tarball
-%define git_build 1
+%define git_build 0
 # If building with git tarball, Fedora requests us to record the rev.  Use:
 # git log -1 --pretty=format:'%h'
 %define git_rev 1849ac1
@@ -115,7 +115,7 @@ Source4: condor-lcmaps-env.sysconfig
 Patch0: condor_config.generic.patch
 Patch1: chkconfig_off.patch
 Patch2: hcc_config.patch
-Patch3: wso2-axis2.patch
+#Patch3: wso2-axis2.patch
 Patch4: condor_pid_namespaces_v7.patch
 Patch5: condor-gahp.patch
 #Patch6: cgahp_scaling.patch
@@ -454,7 +454,7 @@ exit 0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
+#%patch3 -p0
 #%patch4 -p1
 %patch5 -p1
 #%patch6 -p1
@@ -680,9 +680,6 @@ mkdir -p %{buildroot}%{python_sitearch}
 install -m 0755 src/condor_contrib/python-bindings/{classad,htcondor}.so %{buildroot}%{python_sitearch}
 install -m 0755 src/condor_contrib/python-bindings/libpyclassad_*.so %{buildroot}%{_libdir}
 
-# we must place the config examples in builddir so %doc can find them
-mv %{buildroot}/etc/examples %_builddir/%name-%tarball_version
-
 # Remove stuff that comes from the full-deploy
 rm -rf %{buildroot}%{_sbindir}/cleanup_release
 rm -rf %{buildroot}%{_sbindir}/condor_cleanup_local
@@ -747,6 +744,11 @@ mv %{buildroot}%{_libexecdir}/condor/campus_factory/share/condor/condor_config.f
 mv %{buildroot}%{_libexecdir}/condor/campus_factory/etc/campus_factory.conf %{buildroot}%{_sysconfdir}/condor/
 mv %{buildroot}%{_libexecdir}/condor/campus_factory/share %{buildroot}%{_datadir}/condor/campus_factory
 
+# we must place the config examples in builddir so %doc can find them
+cp -rf %{buildroot}/etc/examples %{_builddir}/%{name}-%{tarball_version}
+rm -rf %{buildroot}/etc/examples
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -913,6 +915,7 @@ rm -rf %{buildroot}
 %_sbindir/condor_reconfig
 %_sbindir/condor_replication
 %_sbindir/condor_restart
+%_sbindir/condor_check_security
 %attr(6755, root, root) %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_shadow
@@ -929,7 +932,7 @@ rm -rf %{buildroot}
 %_sbindir/grid_monitor.sh
 %_sbindir/remote_gahp
 %_sbindir/nordugrid_gahp
-%_bindir/condor_ping
+#%_bindir/condor_ping
 %_libexecdir/condor/condor_gpu_discovery
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
@@ -1144,7 +1147,6 @@ rm -rf %{buildroot}
 %_includedir/classad/xmlLexer.h
 %_includedir/classad/xmlSink.h
 %_includedir/classad/xmlSource.h
-%_includedir/classad/classadCache.h
 
 %if %cream
 %files cream-gahp