From: Devrim Gunduz Date: Wed, 16 Apr 2025 19:39:39 +0000 (+0300) Subject: global: Do not build SRPMs unless we can build RPMs. The idea is to prevent SRPMs... X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=95dd4d4408c3e10426d99326ea0c8bedbb40f859;p=pgrpms.git global: Do not build SRPMs unless we can build RPMs. The idea is to prevent SRPMs consuming extra space when the RPMs cannot be built. --- diff --git a/rpm/redhat/global/Makefile.global-PG13 b/rpm/redhat/global/Makefile.global-PG13 index e8a75f961..39391bf4f 100644 --- a/rpm/redhat/global/Makefile.global-PG13 +++ b/rpm/redhat/global/Makefile.global-PG13 @@ -24,7 +24,7 @@ prep13: # Use spectool to download source files, especially tarballs. spectool -g -S --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" $(SPECFILE) -build13: bfsrpm13 +build13: prep13 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm13/BUILDROOT" \ @@ -33,6 +33,7 @@ build13: bfsrpm13 --define "_rpmdir $(HOME)/rpm13/RPMS/" \ --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm13 srpm13: prep13 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -72,7 +73,7 @@ rpm13: prep13 --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild13: bfnosignsrpm13 +nosignbuild13: prep13 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm13/BUILD" \ @@ -81,6 +82,7 @@ nosignbuild13: bfnosignsrpm13 --define "_rpmdir $(HOME)/rpm13/RPMS/" \ --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm13 noprepbuild13: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG13-testing b/rpm/redhat/global/Makefile.global-PG13-testing index fdd770af6..352abecea 100644 --- a/rpm/redhat/global/Makefile.global-PG13-testing +++ b/rpm/redhat/global/Makefile.global-PG13-testing @@ -17,7 +17,7 @@ ## PostgreSQL 13 Testing -build13testing: bfsrpm13testing +build13testing: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm13testing/BUILDROOT" \ @@ -26,6 +26,7 @@ build13testing: bfsrpm13testing --define "_rpmdir $(HOME)/rpm13testing/RPMS/" \ --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm13testing srpm13testing: prep13 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -58,7 +59,7 @@ rpm13testing: prep13 --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild13testimg: bfnosignsrpm13testing +nosignbuild13testimg: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm13testing/BUILD" \ @@ -67,6 +68,7 @@ nosignbuild13testimg: bfnosignsrpm13testing --define "_rpmdir $(HOME)/rpm13testing/RPMS/" \ --define "pgmajorversion 13" --define "pginstdir /usr/pgsql-13" --define "pgpackageversion 13" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm13testing noprepbuild13testing: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG14 b/rpm/redhat/global/Makefile.global-PG14 index 157670fb7..27890464a 100644 --- a/rpm/redhat/global/Makefile.global-PG14 +++ b/rpm/redhat/global/Makefile.global-PG14 @@ -24,7 +24,7 @@ prep14: # Use spectool to download source files, especially tarballs. spectool -g -S --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" $(SPECFILE) -build14: bfsrpm14 +build14: prep14 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \ @@ -33,6 +33,7 @@ build14: bfsrpm14 --define "_rpmdir $(HOME)/rpm14/RPMS/" \ --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm14 srpm14: prep14 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -72,7 +73,7 @@ rpm14: prep14 --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild14: bfnosignsrpm14 +nosignbuild14: prep14 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm14/BUILD" \ @@ -81,6 +82,7 @@ nosignbuild14: bfnosignsrpm14 --define "_rpmdir $(HOME)/rpm14/RPMS/" \ --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm14 noprepbuild14: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG14-testing b/rpm/redhat/global/Makefile.global-PG14-testing index d60afd098..c364fe96e 100644 --- a/rpm/redhat/global/Makefile.global-PG14-testing +++ b/rpm/redhat/global/Makefile.global-PG14-testing @@ -17,7 +17,7 @@ ## PostgreSQL 14 Testing -build14testing: bfsrpm14testing +build14testing: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \ @@ -26,6 +26,7 @@ build14testing: bfsrpm14testing --define "_rpmdir $(HOME)/rpm14testing/RPMS/" \ --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm14testing srpm14testing: prep14 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -58,7 +59,7 @@ rpm14testing: prep14 --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild14testimg: bfnosignsrpm14testing +nosignbuild14testimg: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm14testing/BUILD" \ @@ -67,6 +68,7 @@ nosignbuild14testimg: bfnosignsrpm14testing --define "_rpmdir $(HOME)/rpm14testing/RPMS/" \ --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm14testing noprepbuild14testing: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG15 b/rpm/redhat/global/Makefile.global-PG15 index 8f6d17dc8..cee991584 100644 --- a/rpm/redhat/global/Makefile.global-PG15 +++ b/rpm/redhat/global/Makefile.global-PG15 @@ -24,7 +24,7 @@ prep15: # Use spectool to download source files, especially tarballs. spectool -g -S --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" $(SPECFILE) -build15: bfsrpm15 +build15: prep15 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \ @@ -33,6 +33,7 @@ build15: bfsrpm15 --define "_rpmdir $(HOME)/rpm15/RPMS/" \ --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm15 srpm15: prep15 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -72,7 +73,7 @@ rpm15: prep15 --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild15: bfnosignsrpm15 +nosignbuild15: prep15 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm15/BUILD" \ @@ -81,6 +82,7 @@ nosignbuild15: bfnosignsrpm15 --define "_rpmdir $(HOME)/rpm15/RPMS/" \ --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm15 noprepbuild15: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG15-testing b/rpm/redhat/global/Makefile.global-PG15-testing index 87c61e7fa..d21da450d 100644 --- a/rpm/redhat/global/Makefile.global-PG15-testing +++ b/rpm/redhat/global/Makefile.global-PG15-testing @@ -17,14 +17,7 @@ ## PostgreSQL 15 Testing -prep15testing: - if [ -f dead.package ]; then echo "This package is marked as dead. Build won't continue"; exit 1; fi - # Update spec file, patches, etc, before running spectool: - git pull - # Use spectool to download source files, especially tarballs. - spectool -g -S --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" $(SPECFILE) - -build15testing: bfsrpm15testing +build15testing: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \ @@ -33,6 +26,7 @@ build15testing: bfsrpm15testing --define "_rpmdir $(HOME)/rpm15testing/RPMS/" \ --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm15testing srpm15testing: prep15 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -65,7 +59,7 @@ rpm15testing: prep15 --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild15testimg: bfnosignsrpm15testing +nosignbuild15testimg: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm15testing/BUILD" \ @@ -74,6 +68,7 @@ nosignbuild15testimg: bfnosignsrpm15testing --define "_rpmdir $(HOME)/rpm15testing/RPMS/" \ --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm15testing noprepbuild15testing: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG16 b/rpm/redhat/global/Makefile.global-PG16 index b9b921a3e..c21c00c49 100644 --- a/rpm/redhat/global/Makefile.global-PG16 +++ b/rpm/redhat/global/Makefile.global-PG16 @@ -24,7 +24,7 @@ prep16: # Use spectool to download source files, especially tarballs. spectool -g -S --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" $(SPECFILE) -build16: bfsrpm16 +build16: prep16 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \ @@ -33,6 +33,7 @@ build16: bfsrpm16 --define "_rpmdir $(HOME)/rpm16/RPMS/" \ --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm16 srpm16: prep16 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -72,7 +73,7 @@ rpm16: prep16 --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild16: bfnosignsrpm16 +nosignbuild16: prep16 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm16/BUILD" \ @@ -81,6 +82,7 @@ nosignbuild16: bfnosignsrpm16 --define "_rpmdir $(HOME)/rpm16/RPMS/" \ --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm16 noprepbuild16: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG16-testing b/rpm/redhat/global/Makefile.global-PG16-testing index 4d85f62a4..d25a69148 100644 --- a/rpm/redhat/global/Makefile.global-PG16-testing +++ b/rpm/redhat/global/Makefile.global-PG16-testing @@ -17,7 +17,7 @@ ## PostgreSQL 16 Testing -build16testing: bfsrpm16testing +build16testing: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \ @@ -26,6 +26,7 @@ build16testing: bfsrpm16testing --define "_rpmdir $(HOME)/rpm16testing/RPMS/" \ --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm16testing srpm16testing: prep16 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -58,7 +59,7 @@ rpm16testing: prep16 --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild16testimg: bfnosignsrpm16testing +nosignbuild16testimg: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm16testing/BUILD" \ @@ -67,6 +68,7 @@ nosignbuild16testimg: bfnosignsrpm16testing --define "_rpmdir $(HOME)/rpm16testing/RPMS/" \ --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm16testing noprepbuild16testing: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG17 b/rpm/redhat/global/Makefile.global-PG17 index 787132a0c..469c23442 100644 --- a/rpm/redhat/global/Makefile.global-PG17 +++ b/rpm/redhat/global/Makefile.global-PG17 @@ -24,7 +24,7 @@ prep17: # Use spectool to download source files, especially tarballs. spectool -g -S --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" $(SPECFILE) -build17: bfsrpm17 +build17: prep17 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \ @@ -33,6 +33,7 @@ build17: bfsrpm17 --define "_rpmdir $(HOME)/rpm17/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm17 srpm17: prep17 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -72,7 +73,7 @@ rpm17: prep17 --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild17: bfnosignsrpm17 +nosignbuild17: prep17 rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm17/BUILD" \ @@ -81,6 +82,7 @@ nosignbuild17: bfnosignsrpm17 --define "_rpmdir $(HOME)/rpm17/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm17 noprepbuild17: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG17-testing b/rpm/redhat/global/Makefile.global-PG17-testing index 02d4b3a1f..6f410324d 100644 --- a/rpm/redhat/global/Makefile.global-PG17-testing +++ b/rpm/redhat/global/Makefile.global-PG17-testing @@ -17,7 +17,7 @@ ## PostgreSQL 17 Testing -build17testing: bfsrpm17testing +build17testing: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \ @@ -26,6 +26,7 @@ build17testing: bfsrpm17testing --define "_rpmdir $(HOME)/rpm17testing/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm17testing srpm17testing: prep17 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -58,7 +59,7 @@ rpm17testing: prep17 --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild17testimg: bfnosignsrpm17testing +nosignbuild17testimg: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm17testing/BUILD" \ @@ -67,6 +68,7 @@ nosignbuild17testimg: bfnosignsrpm17testing --define "_rpmdir $(HOME)/rpm17testing/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm17testing noprepbuild17testing: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-PG18-testing b/rpm/redhat/global/Makefile.global-PG18-testing index aaf15bf33..3fd1be4b1 100644 --- a/rpm/redhat/global/Makefile.global-PG18-testing +++ b/rpm/redhat/global/Makefile.global-PG18-testing @@ -17,14 +17,7 @@ ## PostgreSQL 18 Testing -prep18: - if [ -f dead.package ]; then echo "This package is marked as dead. Build won't continue"; exit 1; fi - # Update spec file, patches, etc, before running spectool: - git pull - # Use spectool to download source files, especially tarballs. - spectool -g -S --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" $(SPECFILE) - -build18testing: bfsrpm18testing +build18testing: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \ @@ -33,6 +26,7 @@ build18testing: bfsrpm18testing --define "_rpmdir $(HOME)/rpm18testing/RPMS/" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfsrpm18testing srpm18testing: prep18 rpmbuild --define "_sourcedir ." --define "_specdir ." \ @@ -65,7 +59,7 @@ rpm18testing: prep18 --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ --define "dist $(DIST)" -bb $(SPECFILE) -nosignbuild18testimg: bfnosignsrpm18testing +nosignbuild18testimg: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(HOME)/rpm18testing/BUILD" \ @@ -74,6 +68,7 @@ nosignbuild18testimg: bfnosignsrpm18testing --define "_rpmdir $(HOME)/rpm18testing/RPMS/" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ --define "dist $(DIST)" -bb $(SPECFILE) + make bfnosignsrpm18testing noprepbuild18testing: rpmbuild --define "_sourcedir ." --define "_specdir ." \ diff --git a/rpm/redhat/global/Makefile.global-common b/rpm/redhat/global/Makefile.global-common index 119e1747a..64368817c 100644 --- a/rpm/redhat/global/Makefile.global-common +++ b/rpm/redhat/global/Makefile.global-common @@ -16,7 +16,7 @@ commonbfsrpm: prep --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE) -commonbuild: commonbfsrpm +commonbuild: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \ @@ -25,6 +25,7 @@ commonbuild: commonbfsrpm --define "_rpmdir $(HOME)/rpmcommon/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make commonbfsrpm commonsrpm: prep rpmbuild --define "_sourcedir ." \ diff --git a/rpm/redhat/global/Makefile.global-common-testing b/rpm/redhat/global/Makefile.global-common-testing index 363fa5712..eae4463f8 100644 --- a/rpm/redhat/global/Makefile.global-common-testing +++ b/rpm/redhat/global/Makefile.global-common-testing @@ -16,7 +16,7 @@ commonbfsrpmtesting: prep --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE) -commonbuildtesting: commonbfsrpmtesting +commonbuildtesting: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \ @@ -25,6 +25,7 @@ commonbuildtesting: commonbfsrpmtesting --define "_rpmdir $(HOME)/rpmcommontesting/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make commonbfsrpmtesting commonrpmtesting: prep rpmbuild --define "_sourcedir $(PWD)" \ diff --git a/rpm/redhat/global/Makefile.global-extras b/rpm/redhat/global/Makefile.global-extras index 663d86e20..8b24d6b8f 100644 --- a/rpm/redhat/global/Makefile.global-extras +++ b/rpm/redhat/global/Makefile.global-extras @@ -16,7 +16,7 @@ extrasbfsrpm: prep --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE) -extrasbuild: extrasbfsrpm +extrasbuild: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ @@ -25,6 +25,7 @@ extrasbuild: extrasbfsrpm --define "_rpmdir $(HOME)/pgdg$(DIST).extras/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make extrasbfsrpm extrasrpm: prep rpmbuild --define "_sourcedir $(PWD)" \ diff --git a/rpm/redhat/global/Makefile.global-extras-testing b/rpm/redhat/global/Makefile.global-extras-testing index b873992f0..bad6e814a 100644 --- a/rpm/redhat/global/Makefile.global-extras-testing +++ b/rpm/redhat/global/Makefile.global-extras-testing @@ -16,7 +16,7 @@ extrasbfsrpmtesting: prep --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE) -extrasbuildtesting: extrasbfsrpm +extrasbuildtesting: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ @@ -25,6 +25,7 @@ extrasbuildtesting: extrasbfsrpm --define "_rpmdir $(HOME)/pgdg$(DIST).extrastesting/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "dist $(DIST)" -bb $(SPECFILE) + make extrasbfsrpm extrasrpmtesting: prep rpmbuild --define "_sourcedir $(PWD)" \