From 45891ecd54d9a5116309c8adbc9fea94e8039dc0 Mon Sep 17 00:00:00 2001 From: Devrim Gunduz Date: Wed, 26 Nov 2025 23:10:39 +0300 Subject: [PATCH] global: Use PG 18 for extras builds (though none of the packages depend on PostgreSQL) --- rpm/redhat/global/Makefile.global-extras | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpm/redhat/global/Makefile.global-extras b/rpm/redhat/global/Makefile.global-extras index 9de744c9a..1efb5344f 100644 --- a/rpm/redhat/global/Makefile.global-extras +++ b/rpm/redhat/global/Makefile.global-extras @@ -13,7 +13,7 @@ extrasbfsrpm: prep rpmbuild --define "_sourcedir ." --define "_specdir ." \ --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/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 ." --nodeps -bs $(SPECFILE) extrasbuild: prep @@ -23,7 +23,7 @@ extrasbuild: prep --define "_builddir $(HOME)/pgdg$(DIST).extras/BUILD" \ --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ --define "_rpmdir $(HOME)/pgdg$(DIST).extras/RPMS/" \ - --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ + --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ -bb $(SPECFILE) make extrasbfsrpm @@ -34,14 +34,14 @@ extrasrpm: prep --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/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" \ -bb $(SPECFILE) extrasnoprepbuild: rpmbuild --define "_sourcedir ." --define "_specdir ." \ --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/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 ." --nodeps -bs $(SPECFILE) rpmbuild --define "_sourcedir $(PWD)" \ @@ -50,7 +50,7 @@ extrasnoprepbuild: --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ --define "_rpmdir $(HOME)/pgdg$(DIST).extras/RPMS/" \ - --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ + --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ -bb $(SPECFILE) extrasnopreprpm: @@ -60,13 +60,13 @@ extrasnopreprpm: --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/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" \ -bb $(SPECFILE) extrasnoprepsrpm: rpmbuild --define "_sourcedir ." --define "_specdir ." \ --define "_builddir ." --define "_srcrpmdir ." \ --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/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 ." --nodeps -bs $(SPECFILE) -- 2.39.5