diff options
| -rw-r--r-- | postgresql.spec | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/postgresql.spec b/postgresql.spec index 3c60292..12fc81e 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -35,7 +35,7 @@ %{?beta:%global __os_install_post /usr/lib/rpm/brp-compress} %{!?test:%global test 1} -%{!?upgrade:%global upgrade 1} +%{!?upgrade:%global upgrade 0} %{!?rewind:%global rewind 1} %{!?plpython:%global plpython 1} %{!?plpython3:%global plpython3 0} @@ -729,10 +729,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql # remove files not to be packaged rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -%if !%upgrade -rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_upgrade.* -%endif %if !%plperl rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so @@ -864,6 +860,7 @@ cd - %{_bindir}/pg_dumpall %{_bindir}/pg_isready %{_bindir}/pg_restore +%{_bindir}/pg_upgrade %{_bindir}/psql %{_bindir}/reindexdb %{_bindir}/vacuumdb @@ -879,6 +876,7 @@ cd - %{_mandir}/man1/pg_dumpall.* %{_mandir}/man1/pg_isready.* %{_mandir}/man1/pg_restore.* +%{_mandir}/man1//pg_upgrade.* %{_mandir}/man1/psql.* %{_mandir}/man1/reindexdb.* %{_mandir}/man1/vacuumdb.* @@ -1107,8 +1105,6 @@ cd - %if %upgrade %files upgrade -%{_bindir}/pg_upgrade -%{_mandir}/man1/pg_upgrade.* %endif %if %plperl @@ -1150,7 +1146,8 @@ 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. moved pg_upgrade to + main package * Wed Oct 21 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.5-1 - update to 9.4.5 per release notes |