summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Lane <tgl@fedoraproject.org>2007-06-20 19:19:24 +0000
committerTom Lane <tgl@fedoraproject.org>2007-06-20 19:19:24 +0000
commit1fbccd00b7309925318575dbcf2670706940622d (patch)
treea0c7a27a5f96295909b2846e90742efe5e3e6fb2
parent2ee0978ca26c6b0e6de5089b15ff5d9b36e9bccd (diff)
downloadpostgresql-setup-1fbccd00b7309925318575dbcf2670706940622d.tar.gz
postgresql-setup-1fbccd00b7309925318575dbcf2670706940622d.tar.xz
postgresql-setup-1fbccd00b7309925318575dbcf2670706940622d.zip
Fix breakage in postgresql-test: pg_regress isn't a shell script anymorepostgresql-8_2_4-2_fc8
-rw-r--r--Makefile.regress8
-rwxr-xr-xpostgresql.spec8
2 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.regress b/Makefile.regress
index 9a09a80..df28c64 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -17,10 +17,10 @@ srcdir := .
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: installcheck
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
##
diff --git a/postgresql.spec b/postgresql.spec
index a01e73e..f3d98d7 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -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 -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
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 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jun 20 2007 Tom Lane <tgl@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@redhat.com> 8.2.4-1
- Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs
Resolves: #237682