Merge pull request #348 from mwestphall/SOFTWARE-5872-ospool-ap

SOFTWARE-5872: rename rpm, replace in-text references to osg-flock (keep file paths the same)
opensciencegrid · Oct 29, 2024 · 1d0c59c · 1d0c59c
2 parents 323dacb + 5655143
commit 1d0c59c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/node-check/osgvo-node-advertise b/node-check/osgvo-node-advertise
@@ -204,7 +204,7 @@ find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \;
 find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \;
 
 if [ "x$OSG_SINGULARITY_REEXEC" = "x" ]; then
-    info "This is a setup script for the OSG-FLOCK frontend."
+    info "This is a setup script for the OSPOOL-AP frontend."
     info "In case of problems, contact Mats Rynge ([email protected])"
     info "Running in directory $PWD"
 

diff --git a/ospool-pilot/itb/pilot/advertise-userenv b/ospool-pilot/itb/pilot/advertise-userenv
@@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \;
 find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \;
 find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \;
 
-info "This is a setup script for the OSG-FLOCK frontend."
+info "This is a setup script for the OSPOOL-AP frontend."
 info "In case of problems, contact Mats Rynge ([email protected])"
 info "Running in directory $PWD"
 

diff --git a/ospool-pilot/main/pilot/advertise-userenv b/ospool-pilot/main/pilot/advertise-userenv
@@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \;
 find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \;
 find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \;
 
-info "This is a setup script for the OSG-FLOCK frontend."
+info "This is a setup script for the OSPOOL-AP frontend."
 info "In case of problems, contact Mats Rynge ([email protected])"
 info "Running in directory $PWD"
 

diff --git a/ospool-pilot/old/pilot/advertise-userenv b/ospool-pilot/old/pilot/advertise-userenv
@@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \;
 find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \;
 find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \;
 
-info "This is a setup script for the OSG-FLOCK frontend."
+info "This is a setup script for the OSPOOL-AP frontend."
 info "In case of problems, contact Mats Rynge ([email protected])"
 info "Running in directory $PWD"
 

diff --git a/rpm/osg-flock.spec → rpm/ospool-ap.spec b/rpm/osg-flock.spec → rpm/ospool-ap.spec
@@ -1,17 +1,20 @@
-Name:      osg-flock
-Version:   1.9
+Name:      ospool-ap
+Version:   1.10
 Release:   2%{?dist}
-Summary:   OSG configurations for a flocking host
+Summary:   OSPool Access Point configurations
 
 License:   Apache 2.0
-URL:       https://opensciencegrid.org/docs/submit/osg-flock
+URL:       https://opensciencegrid.org/docs/submit/ospool-ap
 
 BuildArch: noarch
 
 Requires(post): gratia-probe-condor-ap
 BuildRequires: condor
 Requires: condor
 
+Obsoletes: osg-flock <= %{version}
+Provides: osg-flock = %{version}
+
 Source0: %{name}-%{version}%{?gitrev:-%{gitrev}}.tar.gz
 
 %description
@@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 21 2024 Matt Westphall <[email protected]> - 1.10-2
+- Initial release as ospool-ap
+
 * Thu Jun 20 2024 Mats Rynge <[email protected]> - 1.10-1
 - Add extra attributes for transfer ads (OSPOOL-123)
 

diff --git a/wip-node-check/osgvo-advertise-userenv b/wip-node-check/osgvo-advertise-userenv
@@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \;
 find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \;
 find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \;
 
-info "This is a setup script for the OSG-FLOCK frontend."
+info "This is a setup script for the OSPOOL-AP frontend."
 info "In case of problems, contact Mats Rynge ([email protected])"
 info "Running in directory $PWD"