From 40bedfb57522460c8c300bdb1f51e8d53da9f5cf Mon Sep 17 00:00:00 2001
From: Ben Cotton <bcotton@fedoraproject.org>
Date: Jun 19 2019 14:56:57 +0000
Subject: Upgrade to upstream version 8.6.13


---

diff --git a/condor.spec b/condor.spec
index 8c0f73c..6131173 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,5 +1,5 @@
 %global newname         htcondor
-%global srcver          8_6_11
+%global srcver          8_6_13
 
 %ifarch %{arm} %{ix86} x86_64
 %global with_mongodb    1
@@ -19,8 +19,8 @@
 
 #######################
 Name:           condor
-Version:        8.6.11
-Release:        4%{?dist}
+Version:        8.6.13
+Release:        1%{?dist}
 Summary:        HTCondor: High Throughput Computing
 License:        ASL 2.0
 URL:            http://research.cs.wisc.edu/htcondor/
@@ -39,7 +39,7 @@ Patch1:         condor-gahp.patch
 Patch2:         Werror_replace.patch
 Patch3:         condor_aviary_schedulerobject.patch
 Patch4:         condor_aviary_sock_assign.patch
-Patch5:         condor-shared-port.patch
+#Patch5:         condor-shared-port.patch
 Patch6:		libdl.patch
 Patch7:		specify_python2.patch
 
@@ -323,7 +323,7 @@ exit 0
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 cp %{SOURCE1} %{name}-tmpfiles.conf
@@ -452,16 +452,12 @@ mkdir -p -m1777 %{buildroot}/%{_var}/lock/condor/local
 mkdir -p -m0755 %{buildroot}/%{_var}/lib/condor/spool
 mkdir -p -m1777 %{buildroot}/%{_var}/lib/condor/execute
 
-# no master shutdown program for now
-rm %{buildroot}/%{_sbindir}/condor_set_shutdown
-rm %{buildroot}/%{_mandir}/man1/condor_set_shutdown.1.gz
-
 # not packaging standard universe
-rm %{buildroot}/%{_mandir}/man1/condor_compile.1.gz
-rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1.gz
+rm %{buildroot}/%{_mandir}/man1/condor_compile.1*
+rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1*
 
 # not packaging configure/install scripts
-rm %{buildroot}/%{_mandir}/man1/condor_configure.1.gz
+rm %{buildroot}/%{_mandir}/man1/condor_configure.1*
 
 # Remove junk
 rm -r %{buildroot}/%{_sysconfdir}/sysconfig
@@ -604,6 +600,7 @@ rm -rf %{buildroot}/etc/examples
 %_libexecdir/condor/condor_history_helper
 %_libexecdir/condor/condor_pid_ns_init
 %_libexecdir/condor/condor_urlfetch
+%_libexecdir/condor/test_user_mapping
 %_mandir/man1/condor_advertise.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
@@ -628,6 +625,7 @@ rm -rf %{buildroot}/etc/examples
 %_mandir/man1/condor_restart.1.gz
 %_mandir/man1/condor_rm.1.gz
 %_mandir/man1/condor_run.1.gz
+%_mandir/man1/condor_set_shutdown.1.gz
 %_mandir/man1/condor_stats.1.gz
 %_mandir/man1/condor_status.1.gz
 %_mandir/man1/condor_store_cred.1.gz
@@ -733,6 +731,7 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/condor_restart
 %attr(6755, root, root) %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
+%_sbindir/condor_set_shutdown
 %_sbindir/condor_shadow
 %_sbindir/condor_startd
 %_sbindir/condor_starter
@@ -995,6 +994,9 @@ rm -rf %{buildroot}/etc/examples
 /sbin/ldconfig
 
 %changelog
+* Tue Jun 18 2019 Ben Cotton <bcotton@fedoraproject.org> 8.6.13-1
+- Update to latest upstream 8.6.13
+
 * Mon Jun 17 2019 Ben Cotton <bcotton@fedoraproject.org> 8.6.11-5
 - Fix FTBFS