From d2bad5d738c00ccdc918b88b07f41f7562f6a713 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Wed, 26 Jul 2023 11:50:11 -0400 Subject: [PATCH 1/2] Preparing packaging for next version: v5.0.5-0.a1.0 --- psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile | 4 ++-- .../unibuild-packaging/rpm/perfsonar-psconfig-web.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile b/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile index de563c8..b5bbaea 100644 --- a/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile +++ b/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile @@ -7,8 +7,8 @@ PUB_ROOTPATH=/usr/lib/perfsonar/psconfig-web-admin/pub CONFIGPATH=/etc/perfsonar/psconfig-web PUB_CONFIGPATH=/etc/perfsonar/psconfig-web #LIBPATH=/usr/lib/perfsonar/lib -PERFSONAR_AUTO_VERSION=5.0.4 -PERFSONAR_AUTO_RELNUM=1 +PERFSONAR_AUTO_VERSION=5.0.5 +PERFSONAR_AUTO_RELNUM=0.a1.0 VERSION=${PERFSONAR_AUTO_VERSION} RELEASE=${PERFSONAR_AUTO_RELNUM} diff --git a/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec b/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec index d98a0c3..f5f7bbf 100644 --- a/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec +++ b/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec @@ -5,8 +5,8 @@ # cron/apache entries are located in the 'etc' directory %define apache_base /etc/httpd/conf.d -%define perfsonar_auto_version 5.0.4 -%define perfsonar_auto_relnum 1 +%define perfsonar_auto_version 5.0.5 +%define perfsonar_auto_relnum 0.a1.0 %define debug_package %{nil} Name: perfsonar-psconfig-web-admin From c4a22e64819279ac1b01a879724dc1910e0faf32 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Wed, 27 Sep 2023 10:32:49 -0400 Subject: [PATCH 2/2] Releasing psconfig-web - RPM 5.0.5-1 --- psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile | 2 +- .../unibuild-packaging/rpm/perfsonar-psconfig-web.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile b/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile index b5bbaea..5ccf5d6 100644 --- a/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile +++ b/psconfig-web-admin/perfsonar-psconfig-web-admin/Makefile @@ -8,7 +8,7 @@ CONFIGPATH=/etc/perfsonar/psconfig-web PUB_CONFIGPATH=/etc/perfsonar/psconfig-web #LIBPATH=/usr/lib/perfsonar/lib PERFSONAR_AUTO_VERSION=5.0.5 -PERFSONAR_AUTO_RELNUM=0.a1.0 +PERFSONAR_AUTO_RELNUM=1 VERSION=${PERFSONAR_AUTO_VERSION} RELEASE=${PERFSONAR_AUTO_RELNUM} diff --git a/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec b/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec index f5f7bbf..c7769db 100644 --- a/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec +++ b/psconfig-web-admin/perfsonar-psconfig-web-admin/unibuild-packaging/rpm/perfsonar-psconfig-web.spec @@ -6,7 +6,7 @@ %define apache_base /etc/httpd/conf.d %define perfsonar_auto_version 5.0.5 -%define perfsonar_auto_relnum 0.a1.0 +%define perfsonar_auto_relnum 1 %define debug_package %{nil} Name: perfsonar-psconfig-web-admin