HTCONDOR-806: Compile blahp without Globus

debian/changelog

@@ -1,3 +1,9 @@
+blahp (2.2.0-1) stable; urgency=medium
+
+  * Build without Globus
+
+ -- Tim Theisen <[email protected]> Fri, 22 Oct 2021 16:41:25 -0500
+
 blahp (2.1.3-1) stable; urgency=medium
 
   * Fix status caching on EL7 for PBS, Slurm, and LSF

debian/control

@@ -9,10 +9,6 @@ Build-Depends: debhelper (>=9),
                dh-python,
                libtool,
                libclassad-dev,
-               libglobus-gss-assist-dev,
-               libglobus-gsi-cert-utils-dev,
-               libglobus-gsi-credential-dev,
-               libglobus-gsi-proxy-core-dev,
                libssl-dev,
                libxslt1.1,
                pkg-config,

debian/rules

@@ -10,8 +10,8 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	./bootstrap
 	CPPFLAGS="-I/usr/include/classad -std=c++11 -fcommon" \
-	LDFLAGS="-lclassad -lglobus_gsi_credential -lglobus_common -lglobus_gsi_proxy_core" \
-	./configure --prefix=/usr --sysconfdir=/etc --with-classads-prefix=/usr --with-globus-prefix=/usr --with-glite-location=/usr --with-manpage-stylesheet=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl
+	LDFLAGS="-lclassad" \
+	./configure --prefix=/usr --sysconfdir=/etc --with-classads-prefix=/usr --without-globus --with-glite-location=/usr --with-manpage-stylesheet=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl
 
 override_dh_auto_install:
 	dh_auto_install

rpm/blahp.spec

@@ -9,7 +9,7 @@
 %endif
 
 Name:		blahp
-Version:	2.1.3
+Version:	2.2.0
 Release:	1%{?gitrev:.%{gitrev}}%{?dist}
 Summary:	gLite BLAHP daemon
 
@@ -27,10 +27,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  make
 BuildRequires:  condor-classads-devel
-BuildRequires:  globus-gss-assist-devel
-BuildRequires:  globus-gsi-credential-devel
-BuildRequires:  globus-gsi-proxy-core-devel
-BuildRequires:  globus-gsi-cert-utils-devel
 BuildRequires:  docbook-style-xsl, libxslt
 
 %if ! 0%{?rhel} == 7
@@ -50,8 +46,8 @@ sed -i 's;/usr/bin/python3;/usr/bin/python2;' src/scripts/*status.py
 %endif
 ./bootstrap
 export CPPFLAGS="-I/usr/include/classad -std=c++11 -fcommon"
-export LDFLAGS="-lclassad -lglobus_gsi_credential -lglobus_common -lglobus_gsi_proxy_core"
-%configure --with-classads-prefix=/usr --with-globus-prefix=/usr --with-glite-location=/usr
+export LDFLAGS="-lclassad"
+%configure --with-classads-prefix=/usr --without-globus --with-glite-location=/usr
 unset CPPFLAGS
 unset LDFLAGS
 make %{?_smp_mflags}
@@ -116,6 +112,9 @@ fi
 %{_initrddir}/glite-ce-*
 
 %changelog
+* Fri Oct 22 2021 Tim Theisen <[email protected]> 2.2.0-1
+- Build without Globus
+
 * Tue Oct 12 2021 Tim Theisen <[email protected]> 2.1.3-1
 - Fix status caching on EL7 for PBS, Slurm, and LSF