Without pg_update in main package

2 files changed, 11 insertions, 24 deletions

diff --git a/postgresql-9.5-US.pdf b/postgresql-9.5-US.pdf
deleted file mode 100644
index 9128482..0000000
--- a/postgresql-9.5-US.pdf
+++ /dev/null
diff --git a/postgresql.spec b/postgresql.spec
index 3a9d938..3c60292 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -262,26 +262,13 @@ files needed for upgrading a PostgreSQL database from the core system version
 of PostgreSQL.
 %endif
 
-%if %rewind
-%package rewind
-Summary: Support for synchronize a PostgreSQL data directory with another directory that was forked from the first one
-Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?scl:Requires:%scl_runtime}
-
-%description rewind
-The postgresql-rewind package contains the pg_rewind utility and its translation.
-pg_rewind is a tool for synchronizing a PostgreSQL cluster with another copy of the same
-cluster, after the clusters' timelines have diverged.
-%endif
-
 %if %plperl
 %package plperl
 Summary: The Perl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl-Data-Dumper
 %{?scl:Requires:%scl_runtime}
 
 %description plperl
@@ -746,9 +733,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_upgrade.*
 %endif
-%if !%rewind
-rm -f $RPM_BUILD_ROOT%{_bindir}/pg_rewind
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_rewind.*
+
+%if !%plperl
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
+%endif
+
+%if !%plpython
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plpython2.so
 %endif
 
 # initialize file lists
@@ -1048,6 +1039,7 @@ cd -
 %{_bindir}/pg_receivexlog
 %{_bindir}/pg_recvlogical
 %{_bindir}/pg_resetxlog
+%{_bindir}/pg_rewind
 %{_bindir}/postgres
 %{_bindir}/postgresql-setup
 %{_bindir}/postmaster
@@ -1057,6 +1049,7 @@ cd -
 %{_mandir}/man1/pg_ctl.*
 %{_mandir}/man1/pg_receivexlog.*
 %{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/pg_rewind.*
 %{_mandir}/man1/postgres.*
 %{_mandir}/man1/postgresql-setup.*
 %{_mandir}/man1/postmaster.*
@@ -1112,12 +1105,6 @@ cd -
 %{_mandir}/man1/ecpg.*
 %{_mandir}/man3/SPI_*
 
-%if %rewind
-%files rewind
-%{_bindir}/pg_rewind
-%{_mandir}/man1/pg_rewind.*
-%endif
-
 %if %upgrade
 %files upgrade
 %{_bindir}/pg_upgrade
@@ -1163,7 +1150,7 @@ cd -
 %changelog
 * Wed Nov 18 2015 Pavel Kajaba <pkajaba@redhat.com> - 9.5-1
 - Rebase to 9.5. Added: pg_rewind, tsm_system_time, tsm_system_row,
-  removed: test_parser, test_shm_mq, worker_spi 
+  removed: test_parser, test_shm_mq, worker_spi
 
 * Wed Oct 21 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.5-1
 - update to 9.4.5 per release notes