Merge pull request #49 from timtheisen/devel

HTCondor-441: Bump version number to 2.0.2

debian/changelog

@@ -1,9 +1,15 @@
+blahp (2.0.2-1) stable; urgency=medium
+
+  * Fix periodic remove expression, otherwise jobs go on hold
+
+ -- Tim Theisen <[email protected]>  Wed, 28 Apr 2021 07:35:11 -0500
+
 blahp (2.0.1-1) stable; urgency=medium
 
   * Convert to pure Python 3 (no Python 2 compatibility)
   * Restore blah_libexec_directory to the blah.config file
 
- -- Tim Theisen <[email protected]>  Thu, 08 Apr 2021 15:06:13 -0600
+ -- Tim Theisen <[email protected]>  Thu, 08 Apr 2021 15:06:13 -0500
 
 blahp (2.0.0-1) stable; urgency=medium
 

debian/rules

@@ -25,7 +25,7 @@ override_dh_auto_install:
 	mkdir --mode 0755 debian/blahp/etc/blahp
 	for batch_system in pbs sge slurm lsf condor; do \
 		mv debian/blahp/usr/libexec/blahp/$${batch_system}_local_submit_attributes.sh debian/blahp/etc/blahp/; \
-		ln -s ../../../etc/blahp/$${batch_system}_local_submit_attributes.sh \
+		ln -s /etc/blahp/$${batch_system}_local_submit_attributes.sh \
 			debian/blahp/usr/libexec/blahp/$${batch_system}_local_submit_attributes.sh; \
 		done
 		mv debian/blahp/usr/share/doc/glite-ce-blahp-@PVER@ debian/blahp/usr/share/doc/blahp

rpm/blahp.spec

@@ -7,7 +7,7 @@
 %global __python /usr/bin/python3
 
 Name:		blahp
-Version:	2.0.1
+Version:	2.0.2
 Release:	1%{?gitrev:.%{gitrev}}%{?dist}
 Summary:	gLite BLAHP daemon
 
@@ -75,7 +75,7 @@ done
 
 # Create local_submit_attributes.sh symlinks in /etc/blahp
 for batch_system in pbs sge slurm lsf condor; do
-    ln -s ../../../%{bl_sysconfdir}/${batch_system}_local_submit_attributes.sh \
+    ln -s %{bl_sysconfdir}/${batch_system}_local_submit_attributes.sh \
        $RPM_BUILD_ROOT%{bl_libexecdir}/${batch_system}_local_submit_attributes.sh
 done
 
@@ -108,6 +108,9 @@ fi
 %{_initrddir}/glite-ce-*
 
 %changelog
+* Wed Apr 28 2021 Tim Theisen <[email protected]> 2.0.2-1
+- Fix periodic remove expression, otherwise jobs go on hold
+
 * Thu Apr 08 2021 Tim Theisen <[email protected]> 2.0.1-1
 - Convert to pure Python 3 (no Python 2 compatibility)
 - Restore blah_libexec_directory to the blah.config file