[condor/f19] Updated condor to latest version and fix BZ1000106

Wed Sep 25 19:46:51 UTC 2013

commit 3eb51a09c886a30c47c305b6a279a0bbf8026712
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Sep 25 14:43:32 2013 -0500

    Updated condor to latest version and fix BZ1000106

 .gitignore           |    1 +
 condor-tmpfiles.conf |    1 +
 condor.spec          |   55 ++++++++++++++++++++++++++++++++++++++-----------
 sources              |    2 +-
 4 files changed, 45 insertions(+), 14 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b05f298..7b890cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ _build
 /condor-8.1.0-b753ad78-RH.tar.gz
 /condor-8.1.0-38c5dd79-RH.tar.gz
 /condor-8.1.0-eb6f726f-RH.tar.gz
+/condor-8.1.1-12f3fa1-RH.tar.gz
diff --git a/condor-tmpfiles.conf b/condor-tmpfiles.conf
index 68d259a..a0095ba 100644
--- a/condor-tmpfiles.conf
+++ b/condor-tmpfiles.conf
@@ -1,2 +1,3 @@
 d /var/run/condor 0775 condor condor -
 d /var/lock/condor 0775 condor condor -
+d /var/lock/condor/local 0775 condor condor -
\ No newline at end of file
diff --git a/condor.spec b/condor.spec
index 0b2e616..a09776c 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,4 +1,4 @@
-%define tarball_version 8.1.0
+%define tarball_version 8.1.1
 
 #%define _default_patch_fuzz 2
 
@@ -45,8 +45,8 @@
 
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 8.1.0
-%define condor_base_release 0.3
+Version: 8.1.1
+%define condor_base_release 0.1
 %if %git_build
 	%define condor_release %condor_base_release.%{git_rev}.git
 %else
@@ -67,9 +67,9 @@ Source0: condor.tar.gz
 
 %else
 
-# The upstream Condor source tarball contains some source that cannot
+# The upstream HTCondor source tarball contains some source that cannot
 # be shipped as well as extraneous copies of packages the source
-# depends on. Additionally, the upstream Condor source requires a
+# depends on. Additionally, the upstream HTCondor source requires a
 # click-through license. Once you have downloaded the source from:
 #   http://parrot.cs.wisc.edu/v7.0.license.html
 # you should process it with generate-tarball.sh:
@@ -100,9 +100,10 @@ Source0: condor.tar.gz
 #   8f6ba9377309d0d961de538224664f5b  condor_src-7.9.1-all-all.tar.gz
 #   361ef1a724335189088ec9f7ac2b25a7  condor_src-7.9.5-all-all.tar.gz
 #   2807e42ac7ccdb66469497ac72338335  condor_src-8.1.0-all-all.tar.gz
+#   1a892a61869e2141864f8f62aa644711  condor_src-8.1.1-all-all.tar.gz
 #
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-8.1.0-eb6f726f-RH.tar.gz
+Source0: condor-8.1.1-12f3fa1-RH.tar.gz
 Source1: generate-tarball.sh
 %endif
 
@@ -113,7 +114,7 @@ Source3: %{name}.service
 Source4: condor-lcmaps-env.sysconfig
 %endif
 
-Patch0: aviaryfields.patch
+#Patch0: aviaryfields.patch
 Patch1: chkconfig_off.patch
 Patch2: hcc_config.patch
 Patch4: condor_pid_namespaces_v7.patch
@@ -124,7 +125,7 @@ Patch11: condor_oom_v3.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: %_bindir/cmake
+BuildRequires: cmake
 BuildRequires: %_bindir/flex
 BuildRequires: %_bindir/byacc
 BuildRequires: pcre-devel
@@ -139,6 +140,7 @@ BuildRequires: /usr/include/expat.h
 BuildRequires: openldap-devel
 BuildRequires: /usr/include/ldap.h
 BuildRequires: latex2html
+BuildRequires: python-devel
 BuildRequires: boost-devel
 BuildRequires: libuuid-devel
 
@@ -447,8 +449,7 @@ exit 0
 %setup -q -n %{name}-%{tarball_version}
 %endif
 
-
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
@@ -654,7 +655,7 @@ install -Dp -m0755 %{buildroot}/etc/examples/condor.init %buildroot/%_initrddir/
 #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 %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad*.so
 populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
 
 # Remove stuff that comes from the full-deploy
@@ -709,7 +710,7 @@ rm -rf %{buildroot}%{_datadir}/condor/libcondorapi.a
 #rm -f %{buildroot}/etc/examples/cmd_cluster.rb
 #rm -f %{buildroot}/etc/examples/condor.sh
 rm -rf %{buildroot}%{_datadir}/condor/python/{htcondor,classad}.so
-rm -rf %{buildroot}%{_datadir}/condor/{libpyclassad_*,htcondor,classad}.so
+rm -rf %{buildroot}%{_datadir}/condor/{htcondor,classad}.so
 
 rm %{buildroot}%{_libexecdir}/condor/condor_schedd.init
 
@@ -725,6 +726,9 @@ mv %{buildroot}%{_libexecdir}/condor/campus_factory/share %{buildroot}%{_datadir
 cp -rf %{buildroot}/etc/examples %{_builddir}/%{name}-%{tarball_version}
 rm -rf %{buildroot}/etc/examples
 
+# TODO:temporarily remove the config file and figure out if we should breakout as a subpackage
+rm -rf %{buildroot}/etc/condor/ganglia.d
+
 
 %clean
 rm -rf %{buildroot}
@@ -772,6 +776,8 @@ rm -rf %{buildroot}
 %if %blahp
 %_libexecdir/condor/glite/bin/*
 %endif
+%_libexecdir/condor/condor_dagman_metrics_reporter
+%_libexecdir/condor/condor_gangliad
 %_libexecdir/condor/condor_limits_wrapper.sh
 %_libexecdir/condor/condor_rooster
 %_libexecdir/condor/condor_ssh_to_job_shell_setup
@@ -833,6 +839,13 @@ rm -rf %{buildroot}
 %_mandir/man1/condor_gather_info.1.gz
 %_mandir/man1/condor_router_rm.1.gz
 %_mandir/man1/condor_qsub.1.gz
+%_mandir/man1/condor_drain.1.gz
+%_mandir/man1/condor_install.1.gz
+%_mandir/man1/condor_ping.1.gz
+%_mandir/man1/condor_rmdir.1.gz
+%_mandir/man1/condor_tail.1.gz
+%_mandir/man1/condor_who.1.gz
+
 
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_libdir/libcondor_utils*.so
@@ -878,6 +891,7 @@ rm -rf %{buildroot}
 %_bindir/condor_ping
 %_bindir/condor_qsub
 %_bindir/condor_tail
+%_bindir/htsub
 # sbin/condor is a link for master_off, off, on, reconfig,
 # reconfig_schedd, restart
 #%_sbindir/condor
@@ -1126,7 +1140,7 @@ rm -rf %{buildroot}
 
 %files python
 %defattr(-,root,root,-)
-%_libdir/libpyclassad_*.a
+%_libdir/libpyclassad*.so
 %{python_sitearch}/classad.so
 %{python_sitearch}/htcondor.so
 
@@ -1146,10 +1160,19 @@ rm -rf %{buildroot}
 %_bindir/bosco_stop
 %_bindir/bosco_findplatform
 %_bindir/bosco_uninstall
+%_bindir/bosco_quickstart
 %_sbindir/glidein_creation
 %_datadir/condor/campus_factory
 %{python_sitelib}/GlideinWMS
 %{python_sitelib}/campus_factory
+%_mandir/man1/bosco_cluster.1.gz
+%_mandir/man1/bosco_findplatform.1.gz
+%_mandir/man1/bosco_install.1.gz
+%_mandir/man1/bosco_ssh_start.1.gz
+%_mandir/man1/bosco_start.1.gz
+%_mandir/man1/bosco_stop.1.gz
+%_mandir/man1/bosco_uninstall.1.gz
+
 
 %if %systemd
 %post
@@ -1208,6 +1231,12 @@ fi
 * Tue Aug 6 2013 Timothy St. Clair <tstclair at redhat.com> - 8.1.0-0.3
 - Fix for BZ992726 change rpm scriptlet to use condor_tcp_network_connect
 
+* Sun Jul 28 2013 Petr Machata <pmachata at redhat.com> - 8.1.0-0.2.2
+- Rebuild for boost 1.54.0
+
+* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 8.1.0-0.2.1
+- Perl 5.18 rebuild
+
 * Sat Jun 22 2013 <tstclair at redhat.com> - 8.1.0-0.2
 - Fix for aviary hadoop field swap
 
diff --git a/sources b/sources
index 2f01e38..915addf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1443aed2dd7a383d97bcdef95e50edc8  condor-8.1.0-eb6f726f-RH.tar.gz
+835b4df34aa5eddf9b0c569db7b25f59  condor-8.1.1-12f3fa1-RH.tar.gz
