test: pg_regress changed options

Use --bindir instead of --psqldir against PostgreSQL 9.5+.

Related: rhbz#1334276
Version: 9.5.2-2

Makefile.regress

@@ -21,7 +21,7 @@ REGRESS_OPTS += --dlpath=.
 
 pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
 
-pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --psqldir='/usr/bin' $(pg_regress_locale_flags)
+pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --bindir=@bindir@ $(pg_regress_locale_flags)
 
 # Test input and expected files.  These are created by pg_regress itself, so we
 # don't have a rule to create them.  We do need rules to clean them however.

postgresql.spec

@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.5
 Version: 9.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -777,7 +777,9 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
 	rm -f GNUmakefile Makefile *.o
 	chmod 0755 pg_regress regress.so
 	popd
-	cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+	sed 's|@bindir@|%{_bindir}|g' \
+		< %{SOURCE4} \
+		> $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
 	chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
 %endif
 
@@ -1211,6 +1213,9 @@ fi
 %endif
 
 %changelog
+* Mon May 09 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.2-2
+- fix the test subpackage, pg_regress now uses --bindir
+
 * Sun Apr 03 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.2-1
 - update to 9.5.2 per release notes
   http://www.postgresql.org/docs/9.5/static/release-9-5-2.html