[frozen-bubble] Fix hardened build (rhbz#955273)
Hans de Goede
jwrdegoede at fedoraproject.org
Fri May 17 11:46:39 UTC 2013
commit e0d682ef270778a868078e8940d9d62f7435d89c
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri May 17 13:50:40 2013 +0200
Fix hardened build (rhbz#955273)
- Remove rpath
frozen-bubble.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/frozen-bubble.spec b/frozen-bubble.spec
index f88604f..4a6b699 100644
--- a/frozen-bubble.spec
+++ b/frozen-bubble.spec
@@ -1,8 +1,9 @@
-%define _hardened_build 1
+%global _hardened_build 1
+
Summary: Frozen Bubble arcade game
Name: frozen-bubble
Version: 2.2.1
-Release: 0.4.beta1%{?dist}
+Release: 0.5.beta1%{?dist}
License: GPLv2
Group: Amusements/Games
URL: http://www.frozen-bubble.org/
@@ -67,9 +68,13 @@ Frozen Bubble network game server.
%build
+export LDFLAGS="%{?__global_ldflags}"
+export CFLAGS="$RPM_OPT_FLAGS"
%{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
+sed -i "s|'-Wl,-rpath,/usr/.*',||" _build/build_params
./Build
+
%install
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
#%%find_lang %%{name}
@@ -101,9 +106,11 @@ desktop-file-install \
%{__install} -D -p -m 0644 server/init/fb-server.conf \
%{buildroot}%{_sysconfdir}/fb-server.conf
+
%check
./Build test
+
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -146,6 +153,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri May 17 2013 Hans de Goede <hdegoede at redhat.com> - 2.2.1-0.5.beta1
+- Fix hardened build (rhbz#955273)
+- Remove rpath
+
* Wed Mar 6 2013 Hans de Goede <hdegoede at redhat.com> - 2.2.1-0.4.beta1
- Fix FTBFS (rhbz#914013)
- Use new systemd macros for scripts (rhbz#850120)
More information about the scm-commits
mailing list