rpms/postgresql/F-7 Makefile.regress, 1.3, 1.4 postgresql.spec, 1.77, 1.78

[Tom Lane (tgl)]

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9867

Modified Files:
	Makefile.regress postgresql.spec 
Log Message:
Fix breakage in postgresql-test: pg_regress isn't a shell script anymore


Index: Makefile.regress
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/Makefile.regress,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.regress	5 Dec 2006 03:01:02 -0000	1.3
+++ Makefile.regress	20 Jun 2007 19:46:59 -0000	1.4
@@ -17,10 +17,10 @@
 check: installcheck-parallel
 
 installcheck: cleandirs
-	$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
+	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
 
 installcheck-parallel: cleandirs
-	$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
+	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
 
 # The tests command the server to write into testtablespace and results.
 # On a SELinux-enabled system this will fail unless we mark those directories
@@ -37,10 +37,10 @@
 runtest-parallel: installcheck-parallel
 
 bigtest: cleandirs
-	$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
+	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
 
 bigcheck: cleandirs
-	$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
+	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
 
 
 ##


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/postgresql.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- postgresql.spec	24 Apr 2007 19:21:40 -0000	1.77
+++ postgresql.spec	20 Jun 2007 19:46:59 -0000	1.78
@@ -81,7 +81,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -534,7 +534,7 @@
 	install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
 	pushd  $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
 	strip *.so
-	rm -f GNUmakefile Makefile
+	rm -f GNUmakefile Makefile *.o
 	popd
 	cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
 	chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
@@ -822,6 +822,10 @@
 %endif
 
 %changelog
+* Wed Jun 20 2007 Tom Lane <tgl at redhat.com> 8.2.4-2
+- Fix oversight in postgresql-test makefile: pg_regress isn't a shell script
+  anymore.  Per upstream bug 3398.
+
 * Tue Apr 24 2007 Tom Lane <tgl at redhat.com> 8.2.4-1
 - Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs
 Resolves: #237682