globa: Now use PG18 for the common packages

diff --git a/rpm/redhat/global/Makefile.global-common b/rpm/redhat/global/Makefile.global-common
index 32179c057d0b6a0b0a70d97012e70cb5da9324f5..99593de5b45e719fd379e8719be61b8033cd89b6 100644 (file)
--- a/rpm/redhat/global/Makefile.global-common
+++ b/rpm/redhat/global/Makefile.global-common
@@ -13,7 +13,7 @@ commonbfsrpm: prep
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
 
 commonbuild: prep
@@ -23,7 +23,7 @@ commonbuild: prep
        --define "_builddir $(HOME)/rpmcommon/BUILD" \
        --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommon/RPMS/" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
        make commonbfsrpm
 
@@ -34,7 +34,7 @@ commonsrpm: prep
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
-        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
+        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
         --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
 
 commonrpm: prep
@@ -44,14 +44,14 @@ commonrpm: prep
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
 
 commonnoprepbuild:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
@@ -60,7 +60,7 @@ commonnoprepbuild:
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommon/RPMS/" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
 
 commonnopreprpm:
@@ -70,13 +70,13 @@ commonnopreprpm:
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
 
 commonnoprepsrpm:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
 

diff --git a/rpm/redhat/global/Makefile.global-common-testing b/rpm/redhat/global/Makefile.global-common-testing
index 6970e048f4e889c6df715d9077bd48b45763ab8e..d658b7cc84719fce29ab0f5c4c4ce12422248e7f 100644 (file)
--- a/rpm/redhat/global/Makefile.global-common-testing
+++ b/rpm/redhat/global/Makefile.global-common-testing
@@ -13,7 +13,7 @@ commonbfsrpmtesting: prep
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
 
 commonbuildtesting: prep
@@ -23,7 +23,7 @@ commonbuildtesting: prep
        --define "_builddir $(HOME)/rpmcommontesting/BUILD" \
        --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommontesting/RPMS/" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
        make commonbfsrpmtesting
 
@@ -34,14 +34,14 @@ commonrpmtesting: prep
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
 
 commonnoprepbuildtesting:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
@@ -50,7 +50,7 @@ commonnoprepbuildtesting:
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommontesting/RPMS/" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
 
 commonnopreprpmtesting:
@@ -60,13 +60,13 @@ commonnopreprpmtesting:
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "dist $(DIST)" -bb $(SPECFILE)
 
 commonnoprepsrpmtesting:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)