From 75dab7f4c3909ffaa81e1edfe67e0f83d9a86ba7 Mon Sep 17 00:00:00 2001
From: Ben Cotton <bcotton@fedoraproject.org>
Date: Jun 20 2019 16:50:05 +0000
Subject: Do more Python2 fixes


---

diff --git a/condor.spec b/condor.spec
index 6131173..28e4c78 100644
--- a/condor.spec
+++ b/condor.spec
@@ -146,7 +146,7 @@ Part of HTCondor, but able to be stand-alone
 %package aviary-common
 Summary: HTCondor Aviary development components
 Requires: %name = %version-%release
-Requires: python-suds
+Requires: python2-suds
 
 %description aviary-common
 Components to develop against simplified WS interface to HTCondor.
@@ -163,7 +163,7 @@ Components to provide simplified WS interface to HTCondor.
 %package aviary-hadoop-common
 Summary: HTCondor Aviary Hadoop development components
 Requires: %name = %version-%release
-Requires: python-suds
+Requires: python2-suds
 Requires: condor-aviary-common = %{version}-%{release}
 Requires: tar
 
@@ -188,7 +188,7 @@ Requires: %name = %version-%release
 Requires: condor-classads = %{version}-%{release}
 Requires: mongodb
 Requires: pymongo
-Requires: python-dateutil
+Requires: python2-dateutil
 
 %description plumage
 Components to provide a NoSQL operational data store for HTCondor.
@@ -473,7 +473,7 @@ install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 mkdir -p %{buildroot}%{_unitdir}
 cp %{name}.service %{buildroot}%{_unitdir}/condor.service
 
-#populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
+populate %{python2_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
 
 # Remove stuff that comes from the full-deploy
 rm -rf %{buildroot}%{_sbindir}/cleanup_release
@@ -531,9 +531,9 @@ rm -rf %{buildroot}%{_libexecdir}/condor/libclassad_python_user.so
 
 # Install BOSCO
 %if 0%{?with_bosco}
-mkdir -p %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libexecdir}/condor/campus_factory/python-lib/GlideinWMS %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libexecdir}/condor/campus_factory/python-lib/campus_factory %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python2_sitelib}
+mv %{buildroot}%{_libexecdir}/condor/campus_factory/python-lib/GlideinWMS %{buildroot}%{python2_sitelib}
+mv %{buildroot}%{_libexecdir}/condor/campus_factory/python-lib/campus_factory %{buildroot}%{python2_sitelib}
 mv %{buildroot}%{_libexecdir}/condor/campus_factory/share/condor/condor_config.factory %{buildroot}%{_sysconfdir}/condor/config.d/60-campus_factory.config
 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
@@ -665,7 +665,7 @@ rm -rf %{buildroot}/etc/examples
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_libdir/libcondor_utils*.so
 %_libexecdir/condor/panda-plugin.so
-#%_libexecdir/condor/libcollector_python_plugin.so
+%_libexecdir/condor/libcollector_python_plugin.so
 %_bindir/condor_submit_dag
 %_bindir/condor_who
 %_bindir/condor_prio
@@ -946,9 +946,9 @@ rm -rf %{buildroot}/etc/examples
 
 #################
 %files -n python2-condor
-#%{python2_sitearch}/classad.so
-#%{python2_sitearch}/htcondor.so
-#%{_libdir}/libpyclassad2.7_%{srcver}.so
+%{python2_sitearch}/classad.so
+%{python2_sitearch}/htcondor.so
+%{_libdir}/libpyclassad2.7_%{srcver}.so
 
 #################
 %if 0%{?with_bosco}
diff --git a/specify_python2.patch b/specify_python2.patch
index ed49ea9..afaedba 100644
--- a/specify_python2.patch
+++ b/specify_python2.patch
@@ -18,3 +18,29 @@ index f992237a34..fad8aad8ed 100755
  ##**************************************************************
  ##
  ## Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
+diff --git a/build/cmake/CondorConfigure.cmake b/build/cmake/CondorConfigure.cmake
+index 948b45d861..dbbec26777 100644
+--- a/build/cmake/CondorConfigure.cmake
++++ b/build/cmake/CondorConfigure.cmake
+@@ -82,7 +82,7 @@ message(STATUS "********* BEGINNING CONFIGURATION *********")
+ 
+ # To find python in Windows we will use alternate technique
+ if(NOT WINDOWS AND NOT CONDOR_PLATFORM MATCHES "Fedora19")
+-	include (FindPythonInterp)
++	include (FindPython2)
+ 	# As of cmake 2.8.8, the variable below is defined by FindPythonLibs.
+ 	# This helps ensure we get the same version of the libraries and python
+ 	# on systems with both python2 and python3.
+diff --git a/externals/bundles/boost/1.64.0/CMakeLists.txt b/externals/bundles/boost/1.64.0/CMakeLists.txt
+index 0d298808fb..61e8e88670 100644
+--- a/externals/bundles/boost/1.64.0/CMakeLists.txt
++++ b/externals/bundles/boost/1.64.0/CMakeLists.txt
+@@ -29,7 +29,7 @@ if (NOT WINDOWS)
+ 	  set (BOOST_COMPONENTS unit_test_framework ${BOOST_COMPONENTS})
+ 	endif()
+         if (WITH_PYTHON_BINDINGS)
+-          set (BOOST_COMPONENTS python ${BOOST_COMPONENTS})
++          set (BOOST_COMPONENTS python27 ${BOOST_COMPONENTS})
+         endif()
+ 
+     endif()