- rel 51; fix -Werror=trampolines option

diff --git a/macros.pld.in b/macros.pld.in
index 81a08b2412a0a3c5e887c678ff286f1a7437d2d9..4e1f81b715ac79531ac452778daed79cfed0320d 100644 (file)
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -179,8 +179,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 # cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
 %Werror_cflags         -Wformat -Werror=format-security
 
-# Use -Werror=trampoline to prevent GCC from generating code that require executable stack
-%_ssp_cflags           -fstack-protector-strong --param=ssp-buffer-size=4 -Werror=trampoline
+# Use -Werror=trampolines to prevent GCC from generating code that require executable stack
+%_ssp_cflags           -fstack-protector-strong --param=ssp-buffer-size=4 -Werror=trampolines
 %__common_cflags       -O2 -fwrapv -pipe %{Werror_cflags} %{debuginfocflags} %{?_fortify_cflags} %{!?nospecflags:%{?specflags}}
 %__common_cflags_with_ssp      %{__common_cflags} %{?_ssp_cflags}
 

diff --git a/rpm.spec b/rpm.spec
index e67300de12d9b3e85aa340911c5e7cf07fe6f08e..d43a35142c3c65589694912cac5a248aa1ee5bee 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,7 +47,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
-Release:       50
+Release:       51
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm