[condor/f18] Update to 8.1.0

Wed Jun 19 21:04:16 UTC 2013

commit 69d5db357b9e3de7ffb8e25261182c68b335a806
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Jun 19 16:03:48 2013 -0500

    Update to 8.1.0

 .gitignore                  |    1 +
 cgahp_scaling.patch         |  140 ----
 condor-1605-v4.patch        | 1464 -------------------------------------------
 condor.service              |    2 +-
 condor.spec                 |   43 +-
 condor_config.generic.patch |  259 --------
 condor_host_alias_patch.txt |  386 ------------
 sources                     |    2 +-
 wso2-axis2.patch            |   11 -
 zkm-782.patch               |   96 ---
 10 files changed, 24 insertions(+), 2380 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 0e113ab..0cb5c8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ _build
 /condor-7.9.5-af94b2ac-RH.tar.gz
 /condor-7.9.5-8015f029-RH.tar.gz
 /condor-7.9.5-a70e97bf-RH.tar.gz
+/condor-8.1.0-b753ad78-RH.tar.gz
diff --git a/condor.service b/condor.service
index 88bd34e..5b49b7e 100644
--- a/condor.service
+++ b/condor.service
@@ -13,7 +13,7 @@ Restart=always
 RestartSec=5
 StandardOutput=syslog
 LimitNOFILE=16384
-ControlGroup=/condor
+ControlGroup=cpu:/condor
 
 [Install]
 WantedBy=multi-user.target
diff --git a/condor.spec b/condor.spec
index a98e109..999d1ca 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,4 +1,4 @@
-%define tarball_version 7.9.5
+%define tarball_version 8.1.0
 
 #%define _default_patch_fuzz 2
 
@@ -45,8 +45,8 @@
 
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.9.5
-%define condor_base_release 0.2
+Version: 8.1.0
+%define condor_base_release 0.1
 %if %git_build
 	%define condor_release %condor_base_release.%{git_rev}.git
 %else
@@ -99,9 +99,10 @@ Source0: condor.tar.gz
 #   5306421d1b937233b6f07caea9872e29  condor_src-7.9.0-all-all.tar.gz
 #   8f6ba9377309d0d961de538224664f5b  condor_src-7.9.1-all-all.tar.gz
 #   361ef1a724335189088ec9f7ac2b25a7  condor_src-7.9.5-all-all.tar.gz
+#     condor_src-8.1.0-all-all.tar.gz
 #
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.9.5-8015f029-RH.tar.gz
+Source0: condor-8.1.0-b753ad78-RH.tar.gz
 Source1: generate-tarball.sh
 %endif
 
@@ -112,7 +113,7 @@ Source3: %{name}.service
 Source4: condor-lcmaps-env.sysconfig
 %endif
 
-Patch0: condor_config.generic.patch
+#Patch0: condor_config.generic.patch
 Patch1: chkconfig_off.patch
 Patch2: hcc_config.patch
 #Patch3: wso2-axis2.patch
@@ -452,7 +453,7 @@ exit 0
 %setup -q -n %{name}-%{tarball_version}
 %endif
 
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 #%patch3 -p0
@@ -629,17 +630,6 @@ mkdir -p -m1777 %{buildroot}/%{_var}/lib/condor/execute
 rm %{buildroot}/%{_sbindir}/condor_set_shutdown
 rm %{buildroot}/%{_mandir}/man1/condor_set_shutdown.1
 
-# not packaging deployment tools
-rm %{buildroot}/%{_mandir}/man1/condor_config_bind.1
-rm %{buildroot}/%{_mandir}/man1/condor_cold_start.1
-rm %{buildroot}/%{_mandir}/man1/condor_cold_stop.1
-rm %{buildroot}/%{_mandir}/man1/uniq_pid_midwife.1
-rm %{buildroot}/%{_mandir}/man1/uniq_pid_undertaker.1
-rm %{buildroot}/%{_mandir}/man1/filelock_midwife.1
-rm %{buildroot}/%{_mandir}/man1/filelock_undertaker.1
-rm %{buildroot}/%{_mandir}/man1/install_release.1
-rm %{buildroot}/%{_mandir}/man1/cleanup_release.1
-
 # not packaging standard universe
 rm %{buildroot}/%{_mandir}/man1/condor_compile.1
 rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1
@@ -677,9 +667,11 @@ cp %{name}-lcmaps-env.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/%{name}-lc
 install -Dp -m0755 %{buildroot}/etc/examples/condor.init %buildroot/%_initrddir/condor
 %endif
 
-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}
+#mkdir -p %{buildroot}%{python_sitearch}
+#install -m 0755 src/python-bindings/{classad,htcondor}.so %{buildroot}%{python_sitearch}
+#install -m 0755 src/python-bindings/libpyclassad_*.so %{buildroot}%{_libdir}
+populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad_*.a
+populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
 
 # Remove stuff that comes from the full-deploy
 rm -rf %{buildroot}%{_sbindir}/cleanup_release
@@ -856,6 +848,7 @@ rm -rf %{buildroot}
 %_mandir/man1/condor_glidein.1.gz
 %_mandir/man1/condor_gather_info.1.gz
 %_mandir/man1/condor_router_rm.1.gz
+%_mandir/man1/condor_qsub.1.gz
 
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_libdir/libcondor_utils*.so
@@ -898,6 +891,9 @@ rm -rf %{buildroot}
 %_bindir/condor_suspend
 %_bindir/condor_test_match
 %_bindir/condor_drain
+%_bindir/condor_ping
+%_bindir/condor_qsub
+%_bindir/condor_tail
 # sbin/condor is a link for master_off, off, on, reconfig,
 # reconfig_schedd, restart
 #%_sbindir/condor
@@ -916,7 +912,7 @@ rm -rf %{buildroot}
 %_sbindir/condor_reconfig
 %_sbindir/condor_replication
 %_sbindir/condor_restart
-%_sbindir/condor_check_security
+#%_sbindir/condor_check_security
 %attr(6755, root, root) %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_shadow
@@ -1158,7 +1154,7 @@ rm -rf %{buildroot}
 
 %files python
 %defattr(-,root,root,-)
-%_libdir/libpyclassad_*.so
+%_libdir/libpyclassad_*.a
 %{python_sitearch}/classad.so
 %{python_sitearch}/htcondor.so
 
@@ -1239,6 +1235,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 19 2013 <tstclair at redhat.com> - 8.1.0-0.1
+- Update to latest uw/master
+
 * Fri Mar 15 2013 <tstclair at redhat.com> - 7.9.5-0.2
 - Update build dependencies
 
diff --git a/sources b/sources
index 21ff959..9aa73c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68d82850fb740f68604c9861a2e50ee3  condor-7.9.5-8015f029-RH.tar.gz
+ff82130587f92ca1f8813815a831c805  condor-8.1.0-b753ad78-RH.tar.gz
