[liquidwar] Add PIE.
Jon Ciesla
limb at fedoraproject.org
Thu Apr 25 13:38:33 UTC 2013
commit e32f0a580b42bf5f8552a087b1a8e653088c07b7
Author: Jon Ciesla <limburgher at gmail.com>
Date: Thu Apr 25 08:34:25 2013 -0500
Add PIE.
liquidwar.spec | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/liquidwar.spec b/liquidwar.spec
index 491e78a..7bf559d 100644
--- a/liquidwar.spec
+++ b/liquidwar.spec
@@ -1,15 +1,15 @@
%define _hardened_build 1
Name: liquidwar
Version: 5.6.4
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Multiplayer wargame with liquid armies
Group: Amusements/Games
License: GPLv2+
URL: http://www.ufoot.org/liquidwar/v5
Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
-#Source1: liquidwar.init
-Source2: liquidwar.sysconfig
-Source3: liquidwar.logrotate
+#Source1: liquidwar.init
+Source2: liquidwar.sysconfig
+Source3: liquidwar.logrotate
Source4: liquidwar-server.service
Patch0: liquidwar-5.6.4-srv-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@ Requires(preun): /sbin/install-info
Liquid War is a unique multiplayer wargame. You control an army of liquid
and have to try and eat your opponents. A single player mode is available,
but the game is definitely designed to be multiplayer, and has network
-support.
+support.
%package doc
@@ -58,7 +58,7 @@ This package contains the server for hosting network LiquidWar games.
%patch0 -p0 -b .overflow
-# don't strip the binaries please
+# don't strip the binaries please
sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in
# fix manpage doc reference
sed -i \
@@ -79,12 +79,14 @@ done
%ifnarch %{ix86}
--disable-asm \
%endif
-LDFLAGS="-lm"
+LDFLAGS="%{__global_ldflags}"
+CFLAGS="$RPM_OPT_FLAGS"
+LDFLAGS="$LDFLAGS -lm"
MAKE_FLAGS="DEBUG_FLAGS= GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}"
# to show to compile flags with out MAKE_FLAGS
-make config $MAKE_FLAGS LDFLAGS="-lm"
-make %{?_smp_mflags} $MAKE_FLAGS LDFLAGS="-lm"
+make config $MAKE_FLAGS LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
+make %{?_smp_mflags} $MAKE_FLAGS LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
# make docs utf-8
iconv -f ISO-8859-1 -t UTF8 doc/man/%{name}.6 | gzip > doc/man/%{name}.6.gz
@@ -96,7 +98,7 @@ gzip -f doc/info/%{name}.info
%install
rm -rf $RPM_BUILD_ROOT
make install_nolink DESTDIR=$RPM_BUILD_ROOT GAMEDIR=%{_bindir} \
- DATADIR=%{_datadir}/%{name}
+ DATADIR=%{_datadir}/%{name}
mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} liquidwardocs
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
@@ -156,8 +158,8 @@ fi
%post server
#/sbin/chkconfig --add %%{name}-server
-if [ $1 -eq 1 ] ; then
- # Initial installation
+if [ $1 -eq 1 ] ; then
+ # Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
@@ -221,6 +223,9 @@ fi
%changelog
+* Thu Apr 25 2013 Jon Ciesla <limburgher at gmail.com> - 5.6.4-16
+- Add PIE, BZ 955271.
+
* Mon Feb 11 2013 Jon Ciesla <limburgher at gmail.com> - 5.6.4-15
- Drop desktop vendor tag.
@@ -262,7 +267,7 @@ fi
- Autorebuild for GCC 4.3
* Wed Dec 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 5.6.4-2
-- Fix generation of debuginfo package (bz 413081)
+- Fix generation of debuginfo package (bz 413081)
- Fix encoding of README.* files
* Mon Oct 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 5.6.4-1
More information about the scm-commits
mailing list