rpms/postgresql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

spec: drop the old %beta hack about %__os_install_post

Browse Source 
This always was broken and the %__os_install_post macro was
redefined also for non-beta builds;  that's because
%{?x:%global y z} defines %y even when %x is zero.

If we really wanted this %beta/%post hack, it would have to look
similarly to:
%{lua:if rpm.expand("%beta") ~= "0" then rpm.define('...') end}
On the other hand, I'm not sure that this is actually needed
nowadays so I'm removing it completely.  Please let us know if you
happen to need the %__os_install_post redefinition.

Originally added by commit 9636c11b0d.

Version: 9.6.3-5
This commit is contained in:
Pavel Raiskup 2017-06-21 08:44:04 +02:00
parent 235453b233
commit 36a141a4c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postgresql.spec
View File

@ -30,7 +30,6 @@
# always get built. # always get built.
%{!?beta:%global beta 0} %{!?beta:%global beta 0}
%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress}
%{!?test:%global test 1} %{!?test:%global test 1}
%{!?upgrade:%global upgrade 1} %{!?upgrade:%global upgrade 1}
@ -64,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 9.6 %global majorversion 9.6
Version: 9.6.3 Version: 9.6.3
Release: 4%{?dist} Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI # The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well. # recognizes it as an independent license, so we do as well.
@ -1163,6 +1162,9 @@ make -C postgresql-setup-%{setup_version} check
%endif %endif
%changelog %changelog
* Wed Jun 21 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.3-5
- drop the __os_install_post redefinition hack
* Mon Jun 12 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.3-4 * Mon Jun 12 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.3-4
- drop -DLINUX_OOM_SCORE_ADJ=0 define from CFLAGS (rhbz#1110969, rhbz#1436554) - drop -DLINUX_OOM_SCORE_ADJ=0 define from CFLAGS (rhbz#1110969, rhbz#1436554)