From 36a141a4c0bd2488ea4476d76dc8d256e38182c9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 21 Jun 2017 08:44:04 +0200 Subject: [PATCH] spec: drop the old %beta hack about %__os_install_post 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 9636c11b0d6049d23. Version: 9.6.3-5 --- postgresql.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index d94f0a0..2dc88de 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -30,7 +30,6 @@ # always get built. %{!?beta:%global beta 0} -%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress} %{!?test:%global test 1} %{!?upgrade:%global upgrade 1} @@ -64,7 +63,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 9.6 Version: 9.6.3 -Release: 4%{?dist} +Release: 5%{?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. @@ -1163,6 +1162,9 @@ make -C postgresql-setup-%{setup_version} check %endif %changelog +* Wed Jun 21 2017 Pavel Raiskup - 9.6.3-5 +- drop the __os_install_post redefinition hack + * Mon Jun 12 2017 Pavel Raiskup - 9.6.3-4 - drop -DLINUX_OOM_SCORE_ADJ=0 define from CFLAGS (rhbz#1110969, rhbz#1436554)