global: Stop relying on $DIST variable in Makefiles (except parts of extras packaging...

I will use the following in the PGDG RPM repository:

%dist .rhel9.6
%dist .rhel10.0
%dist .rhel10.1
%dist .f43
%dist .sles15.6

Sorry if this change breaks build processes who rely on these scripts and spec files, but I had to do it:

https://github.com/pgdg-packaging/pgdg-rpms/issues/119

diff --git a/rpm/redhat/global/Makefile.global-PG14 b/rpm/redhat/global/Makefile.global-PG14
index 27890464a9e80f584299f0a9366359f00daa3db5..7981a06fdefa0dd7f44c18793ab21cccaf6e329a 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG14
+++ b/rpm/redhat/global/Makefile.global-PG14
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 14   #
-# packaging                    #
+# packaging                    #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -32,56 +32,56 @@ build14: prep14
        --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
        --define "_rpmdir $(HOME)/rpm14/RPMS/" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm14
 
 srpm14: prep14
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm14: prep14
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm14:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm14: prep14
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm14: prep14
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild14: prep14
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm14/BUILD" \
+       --define "_builddir $(HOME)/rpm14/BUILD" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
        --define "_rpmdir $(HOME)/rpm14/RPMS/" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm14
 
 noprepbuild14:
@@ -89,30 +89,30 @@ noprepbuild14:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm14/BUILD" \
+       --define "_builddir $(HOME)/rpm14/BUILD" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm14/SRPMS" \
        --define "_rpmdir $(HOME)/rpm14/RPMS/" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm14:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm14:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm14/BUILDROOT" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG14-testing b/rpm/redhat/global/Makefile.global-PG14-testing
index b7ac011d4bb687e6106af180ffa75fc7e6a5116b..b3a9f5af6e34450f90dc4bfd130fec27ce220efa 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG14-testing
+++ b/rpm/redhat/global/Makefile.global-PG14-testing
@@ -2,16 +2,16 @@
 # Makefile for PostgreSQL 14   #
 # testing packaging            #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -25,49 +25,49 @@ build14testing: prep14
        --define "_srcrpmdir $(HOME)/rpm14testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm14testing/RPMS/" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm14testing
 
 srpm14testing: prep14
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm14testing: prep14
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm14testing: prep14
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14testing/SRPMS" \
-       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14"  --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm14testing: prep14
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild14testimg:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm14testing/BUILD" \
+       --define "_builddir $(HOME)/rpm14testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm14testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm14testing/RPMS/" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm14testing
 
 noprepbuild14testing:
@@ -75,30 +75,30 @@ noprepbuild14testing:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm14testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm14testing/BUILD" \
+       --define "_builddir $(HOME)/rpm14testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm14testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm14testing/RPMS/" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm14testing:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm14testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm14testing/BUILDROOT" \
        --define "pgmajorversion 14" --define "pginstdir /usr/pgsql-14" --define "pgpackageversion 14" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG15 b/rpm/redhat/global/Makefile.global-PG15
index cee99158460b1e930085db1102ddabf5fd583a41..40405099b89385d563e8149a18c8b81f24eba815 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG15
+++ b/rpm/redhat/global/Makefile.global-PG15
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 15   #
-# packaging                    #
+# packaging                    #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -32,56 +32,56 @@ build15: prep15
        --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
        --define "_rpmdir $(HOME)/rpm15/RPMS/" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm15
 
 srpm15: prep15
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm15: prep15
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm15:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm15: prep15
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm15: prep15
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild15: prep15
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm15/BUILD" \
+       --define "_builddir $(HOME)/rpm15/BUILD" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
        --define "_rpmdir $(HOME)/rpm15/RPMS/" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm15
 
 noprepbuild15:
@@ -89,30 +89,30 @@ noprepbuild15:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm15/BUILD" \
+       --define "_builddir $(HOME)/rpm15/BUILD" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm15/SRPMS" \
        --define "_rpmdir $(HOME)/rpm15/RPMS/" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm15:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm15:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm15/BUILDROOT" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG15-testing b/rpm/redhat/global/Makefile.global-PG15-testing
index 1f6f9771d482fc58ee49465d7bf01a964d960990..962a6482d9c7dd9558d20f239e28bac507ea6383 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG15-testing
+++ b/rpm/redhat/global/Makefile.global-PG15-testing
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 15   #
-# testing packaging            #
+# testing packaging            #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -25,49 +25,49 @@ build15testing: prep15
        --define "_srcrpmdir $(HOME)/rpm15testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm15testing/RPMS/" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm15testing
 
 srpm15testing: prep15
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm15testing: prep15
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm15testing: prep15
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15testing/SRPMS" \
-       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15"  --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm15testing: prep15
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild15testimg:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm15testing/BUILD" \
+       --define "_builddir $(HOME)/rpm15testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm15testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm15testing/RPMS/" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm15testing
 
 noprepbuild15testing:
@@ -75,30 +75,30 @@ noprepbuild15testing:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm15testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm15testing/BUILD" \
+       --define "_builddir $(HOME)/rpm15testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm15testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm15testing/RPMS/" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm15testing:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm15testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm15testing/BUILDROOT" \
        --define "pgmajorversion 15" --define "pginstdir /usr/pgsql-15" --define "pgpackageversion 15" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG16 b/rpm/redhat/global/Makefile.global-PG16
index c21c00c490cf0862cb0954c1c7c76fbb991bd34b..41468839af516911075eeaec34994a62dd52c254 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG16
+++ b/rpm/redhat/global/Makefile.global-PG16
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 16   #
-# packaging                    #
+# packaging                    #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -32,56 +32,56 @@ build16: prep16
        --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
        --define "_rpmdir $(HOME)/rpm16/RPMS/" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm16
 
 srpm16: prep16
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm16: prep16
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm16:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm16: prep16
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm16: prep16
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild16: prep16
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm16/BUILD" \
+       --define "_builddir $(HOME)/rpm16/BUILD" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
        --define "_rpmdir $(HOME)/rpm16/RPMS/" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm16
 
 noprepbuild16:
@@ -89,30 +89,30 @@ noprepbuild16:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm16/BUILD" \
+       --define "_builddir $(HOME)/rpm16/BUILD" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm16/SRPMS" \
        --define "_rpmdir $(HOME)/rpm16/RPMS/" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm16:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm16:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm16/BUILDROOT" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG16-testing b/rpm/redhat/global/Makefile.global-PG16-testing
index ef3ffd70fc02c725ae37279c7ec41ab15808a789..fd48954c08901874528470c6c33acf104ac41571 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG16-testing
+++ b/rpm/redhat/global/Makefile.global-PG16-testing
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 16   #
-# testing packaging            #
+# testing packaging            #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -25,49 +25,49 @@ build16testing: prep16
        --define "_srcrpmdir $(HOME)/rpm16testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm16testing/RPMS/" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm16testing
 
 srpm16testing: prep16
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm16testing: prep16
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm16testing: prep16
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16testing/SRPMS" \
-       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16"  --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm16testing: prep16
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild16testimg:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm16testing/BUILD" \
+       --define "_builddir $(HOME)/rpm16testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm16testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm16testing/RPMS/" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm16testing
 
 noprepbuild16testing:
@@ -75,30 +75,30 @@ noprepbuild16testing:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm16testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm16testing/BUILD" \
+       --define "_builddir $(HOME)/rpm16testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm16testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm16testing/RPMS/" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm16testing:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm16testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm16testing/BUILDROOT" \
        --define "pgmajorversion 16" --define "pginstdir /usr/pgsql-16" --define "pgpackageversion 16" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG17 b/rpm/redhat/global/Makefile.global-PG17
index 469c234421857681caaf93102389fa3105ccd4f6..3f266f5b0d93afad05591129989c400a8e341d38 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG17
+++ b/rpm/redhat/global/Makefile.global-PG17
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 17   #
-# packaging                    #
+# packaging                    #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -32,56 +32,56 @@ build17: prep17
        --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
        --define "_rpmdir $(HOME)/rpm17/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm17
 
 srpm17: prep17
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm17: prep17
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm17:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm17: prep17
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm17: prep17
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild17: prep17
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm17/BUILD" \
+       --define "_builddir $(HOME)/rpm17/BUILD" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
        --define "_rpmdir $(HOME)/rpm17/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm17
 
 noprepbuild17:
@@ -89,30 +89,30 @@ noprepbuild17:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm17/BUILD" \
+       --define "_builddir $(HOME)/rpm17/BUILD" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm17/SRPMS" \
        --define "_rpmdir $(HOME)/rpm17/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm17:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm17:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm17/BUILDROOT" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG17-testing b/rpm/redhat/global/Makefile.global-PG17-testing
index 9c637b10ca30a2126ff84018595c5d2b8f80f894..75c4c8b7ffd413318d7fd13eb5acdeaf1495333d 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG17-testing
+++ b/rpm/redhat/global/Makefile.global-PG17-testing
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 17   #
-# testing packaging            #
+# testing packaging            #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -25,49 +25,49 @@ build17testing: prep17
        --define "_srcrpmdir $(HOME)/rpm17testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm17testing/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm17testing
 
 srpm17testing: prep17
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm17testing: prep17
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm17testing: prep17
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17testing/SRPMS" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm17testing: prep17
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild17testimg:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm17testing/BUILD" \
+       --define "_builddir $(HOME)/rpm17testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm17testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm17testing/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm17testing
 
 noprepbuild17testing:
@@ -75,30 +75,30 @@ noprepbuild17testing:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm17testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm17testing/BUILD" \
+       --define "_builddir $(HOME)/rpm17testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm17testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm17testing/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm17testing:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm17testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm17testing/BUILDROOT" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG18 b/rpm/redhat/global/Makefile.global-PG18
index c015e5bcec4e73c2cc91e407d94673ff9eb0d52e..bd800f7d82ed900cd12a32d8af7f39029f2d4fc5 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG18
+++ b/rpm/redhat/global/Makefile.global-PG18
@@ -31,56 +31,56 @@ build18: prep18
        --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
        --define "_rpmdir $(HOME)/rpm18/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm18
 
 srpm18: prep18
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm18: prep18
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm18:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm18: prep18
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm18: prep18
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild18: prep18
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm18/BUILD" \
+       --define "_builddir $(HOME)/rpm18/BUILD" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
        --define "_rpmdir $(HOME)/rpm18/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm18
 
 noprepbuild18:
@@ -88,30 +88,30 @@ noprepbuild18:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm18/BUILD" \
+       --define "_builddir $(HOME)/rpm18/BUILD" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm18/SRPMS" \
        --define "_rpmdir $(HOME)/rpm18/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm18:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm18:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm18/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG18-testing b/rpm/redhat/global/Makefile.global-PG18-testing
index 85dc5740b661e66979db9ac3df25a445ac7f71fc..0241f1d45da3699fa6c730903459cf73be63ff6f 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG18-testing
+++ b/rpm/redhat/global/Makefile.global-PG18-testing
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 18   #
-# testing packaging            #
+# testing packaging            #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -25,56 +25,56 @@ build18testing: prep18
        --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm18testing/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm18testing
 
 srpm18testing: prep18
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm18testing: prep18
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm18testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm18testing: prep18
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm18testing: prep18
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild18testimg:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm18testing/BUILD" \
+       --define "_builddir $(HOME)/rpm18testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm18testing/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm18testing
 
 noprepbuild18testing:
@@ -82,30 +82,30 @@ noprepbuild18testing:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm18testing/BUILD" \
+       --define "_builddir $(HOME)/rpm18testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm18testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm18testing/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm18testing:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm18testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm18testing/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-PG19-testing b/rpm/redhat/global/Makefile.global-PG19-testing
index 7f5fe8d0faf1c58438d8e289056b5744c93ce956..bd2f8cbba13c4aef19fa9e36fcf3f822ca0bfd5d 100644 (file)
--- a/rpm/redhat/global/Makefile.global-PG19-testing
+++ b/rpm/redhat/global/Makefile.global-PG19-testing
@@ -1,17 +1,17 @@
 #################################
 # Makefile for PostgreSQL 19   #
-# testing packaging            #
+# testing packaging            #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
-#                              #
 #                              #
-# build target is for          #
-# RPM buildfarm                        #
-#                              #
-#                              #
+#                              #
+# build target is for          #
+# RPM buildfarm                        #
+#                              #
+#                              #
 #################################
 
 
@@ -32,56 +32,56 @@ build19testing: prep19
        --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm19testing/RPMS/" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfsrpm19testing
 
 srpm19testing: prep19
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
-       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19"  --define "pgpackageversion 19" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfsrpm19testing: prep19
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
-       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19"  --define "pgpackageversion 19" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnoprepsrpm19testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
-       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19"  --define "pgpackageversion 19" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 bfnosignsrpm19testing: prep19
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
-       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19"  --define "pgpackageversion 19" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 rpm19testing: prep19
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nosignbuild19testimg:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm19testing/BUILD" \
+       --define "_builddir $(HOME)/rpm19testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm19testing/RPMS/" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make bfnosignsrpm19testing
 
 noprepbuild19testing:
@@ -89,30 +89,30 @@ noprepbuild19testing:
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpm19testing/BUILD" \
+       --define "_builddir $(HOME)/rpm19testing/BUILD" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpm19testing/SRPMS" \
        --define "_rpmdir $(HOME)/rpm19testing/RPMS/" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 nopreprpm19testing:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 noprepsrpm19testing:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpm19testing/BUILDROOT" \
        --define "pgmajorversion 19" --define "pginstdir /usr/pgsql-19" --define "pgpackageversion 19" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)

diff --git a/rpm/redhat/global/Makefile.global-common b/rpm/redhat/global/Makefile.global-common
index 99593de5b45e719fd379e8719be61b8033cd89b6..e94360a4cb06ffdaacc930f5489a20a0733c4e06 100644 (file)
--- a/rpm/redhat/global/Makefile.global-common
+++ b/rpm/redhat/global/Makefile.global-common
@@ -2,9 +2,9 @@
 # Makefile for PostgreSQL      #
 # common packaging             #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
 
 ## PostgreSQL common build targets
@@ -13,8 +13,8 @@ commonbfsrpm: prep
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 commonbuild: prep
        rpmbuild --define "_sourcedir $(PWD)" \
@@ -24,59 +24,59 @@ commonbuild: prep
        --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommon/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make commonbfsrpm
 
 commonsrpm: prep
        rpmbuild --define "_sourcedir ." \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
-        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-        --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 commonrpm: prep
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 commonnoprepbuild:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpmcommon/BUILD" \
+       --define "_builddir $(HOME)/rpmcommon/BUILD" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpmcommon/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommon/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 commonnopreprpm:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 commonnoprepsrpm:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpmcommon/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 

diff --git a/rpm/redhat/global/Makefile.global-common-testing b/rpm/redhat/global/Makefile.global-common-testing
index d658b7cc84719fce29ab0f5c4c4ce12422248e7f..9eaca05655fef12d1a56134aa7a53878a17e8d2e 100644 (file)
--- a/rpm/redhat/global/Makefile.global-common-testing
+++ b/rpm/redhat/global/Makefile.global-common-testing
@@ -2,9 +2,9 @@
 # Makefile for PostgreSQL      #
 # common packaging             #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
 
 ## PostgreSQL common testing build targets
@@ -13,8 +13,8 @@ commonbfsrpmtesting: prep
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
-       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"  --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 commonbuildtesting: prep
        rpmbuild --define "_sourcedir $(PWD)" \
@@ -24,49 +24,49 @@ commonbuildtesting: prep
        --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommontesting/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make commonbfsrpmtesting
 
 commonrpmtesting: prep
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 commonnoprepbuildtesting:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/rpmcommontesting/BUILD" \
+       --define "_builddir $(HOME)/rpmcommontesting/BUILD" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/rpmcommontesting/SRPMS" \
        --define "_rpmdir $(HOME)/rpmcommontesting/RPMS/" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 commonnopreprpmtesting:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 commonnoprepsrpmtesting:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/rpmcommontesting/BUILDROOT" \
        --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 

diff --git a/rpm/redhat/global/Makefile.global-extras b/rpm/redhat/global/Makefile.global-extras
index e0dc0111ac2df3a1b9947fb7a0df068dd849fbdc..9de744c9a2f5d83966eabe51ba46da1e66c01ffc 100644 (file)
--- a/rpm/redhat/global/Makefile.global-extras
+++ b/rpm/redhat/global/Makefile.global-extras
@@ -2,9 +2,9 @@
 # Makefile for PostgreSQL      #
 # Extras packaging             #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
 
 ## PostgreSQL extras build targets
@@ -13,8 +13,8 @@ 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 "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 extrasbuild: prep
        rpmbuild --define "_sourcedir $(PWD)" \
@@ -24,49 +24,49 @@ extrasbuild: prep
        --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 "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make extrasbfsrpm
 
 extrasrpm: prep
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --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 "dist $(DIST)" -bb $(SPECFILE)
+       -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 "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/pgdg$(DIST).extras/BUILD" \
+       --define "_builddir $(HOME)/pgdg$(DIST).extras/BUILD" \
        --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 "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 extrasnopreprpm:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --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 "dist $(DIST)" -bb $(SPECFILE)
+       -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 "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 

diff --git a/rpm/redhat/global/Makefile.global-extras-testing b/rpm/redhat/global/Makefile.global-extras-testing
index 9bcbce841cdd34d2e35385d80cd35be2f9b89d78..86253d57869c35b17c5c202e6e8d7741d070fbde 100644 (file)
--- a/rpm/redhat/global/Makefile.global-extras-testing
+++ b/rpm/redhat/global/Makefile.global-extras-testing
@@ -2,9 +2,9 @@
 # Makefile for PostgreSQL      #
 # Extras packaging             #
 # https://yum.postgresql.org   #
-#                              #
-# Devrim Gunduz                        #
-# devrim@gunduz.org            #
+#                              #
+# Devrim Gunduz                        #
+# devrim@gunduz.org            #
 #################################
 
 ## PostgreSQL extras build targets
@@ -13,8 +13,8 @@ extrasbfsrpmtesting: prep
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \
        --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \
-       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"  --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
 extrasbuildtesting: prep
        rpmbuild --define "_sourcedir $(PWD)" \
@@ -24,49 +24,49 @@ extrasbuildtesting: prep
        --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \
        --define "_rpmdir $(HOME)/pgdg$(DIST).extrastesting/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
        make extrasbfsrpm
 
 extrasrpmtesting: prep
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 extrasnoprepbuildtesting:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \
        --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)
 
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(HOME)/pgdg$(DIST).extrastesting/BUILD" \
+       --define "_builddir $(HOME)/pgdg$(DIST).extrastesting/BUILD" \
        --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \
        --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \
        --define "_rpmdir $(HOME)/pgdg$(DIST).extrastesting/RPMS/" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 extrasnopreprpmtesting:
        rpmbuild --define "_sourcedir $(PWD)" \
        --define "_specdir $(PWD)" \
-       --define  "_builddir $(PWD)" \
+       --define "_builddir $(PWD)" \
        --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \
        --define "_srcrpmdir $(PWD)" \
        --define "_rpmdir $(PWD)" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "dist $(DIST)" -bb $(SPECFILE)
+       -bb $(SPECFILE)
 
 extrasnoprepsrpmtesting:
        rpmbuild --define "_sourcedir ." --define "_specdir ." \
        --define "_builddir ." --define "_srcrpmdir ." \
        --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \
        --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \
-       --define "_rpmdir ." --define "dist $(DIST)" --nodeps -bs $(SPECFILE)
+       --define "_rpmdir ." --nodeps -bs $(SPECFILE)