[hedgewars] Update to 0.9.13.
Bruno Wolff III
bruno at fedoraproject.org
Sun Oct 3 17:35:51 UTC 2010
commit 4ce1ddb7a829d76df83d0737a2a797561c6eabae
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Oct 3 12:32:34 2010 -0500
Update to 0.9.13.
ghc-hslogger is available now, so server can use logging.
Use -dynamic for ghc builds.
.gitignore | 1 +
hedgewars-0.9.0-debuginfo.patch | 24 -------
hedgewars-compiler-opts.patch | 38 +++++++++++
hedgewars-nolog.patch | 133 ---------------------------------------
hedgewars-remove-Nu.patch | 11 ---
hedgewars.spec | 31 ++++-----
sources | 2 +-
7 files changed, 53 insertions(+), 187 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47396b8..53904bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
hedgewars-src-0.9.12.tar.bz2
+/hedgewars-src-0.9.13.tar.bz2
diff --git a/hedgewars-compiler-opts.patch b/hedgewars-compiler-opts.patch
new file mode 100644
index 0000000..ae50855
--- /dev/null
+++ b/hedgewars-compiler-opts.patch
@@ -0,0 +1,38 @@
+--- CMakeLists.txt.orig 2010-04-03 11:38:48.000000000 -0500
++++ CMakeLists.txt 2010-10-03 12:00:04.881370735 -0500
+@@ -122,9 +122,9 @@
+
+
+ #set default flags values for all the project
+-set(CMAKE_C_FLAGS "-pipe")
+-set(CMAKE_C_FLAGS_RELEASE "-w -O2 -fomit-frame-pointer")
+-set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG")
++set(CMAKE_C_FLAGS ${CFLAGS})
++set(CMAKE_C_FLAGS_RELEASE ${CFLAGS})
++set(CMAKE_C_FLAGS_DEBUG ${CFLAGS})
+ set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
+ set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+ set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+@@ -137,10 +137,10 @@
+
+ if(Optz)
+ set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
+- set(haskell_compiler_flags_cmn "-O2" "-w")
++ set(haskell_compiler_flags_cmn ${CFLAGS} "-dynamic")
+ else(Optz)
+- set(pascal_compiler_flags_cmn "-O-" "-ghl" "-dDEBUGFILE" "-vwnv" ${pascal_compiler_flags_cmn})
+- set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint")
++ set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
++ set(haskell_compiler_flags_cmn ${CFLAGS} "-dynamic")
+ endif(Optz)
+
+
+@@ -192,7 +192,7 @@
+ set(CPACK_NSIS_MODIFY_PATH OFF)
+ set(CPACK_GENERATOR "ZIP;NSIS")
+ else(WIN32 AND NOT UNIX)
+- set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
++ set(CPACK_STRIP_FILES "")
+ endif(WIN32 AND NOT UNIX)
+
+ set(CPACK_SOURCE_IGNORE_FILES
diff --git a/hedgewars.spec b/hedgewars.spec
index 25d6a49..ee37705 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -1,6 +1,6 @@
Name: hedgewars
-Version: 0.9.12
-Release: 4%{?dist}
+Version: 0.9.13
+Release: 1%{?dist}
Summary: 2D tankbattle game with the tanks replaced by hedgehogs
Group: Amusements/Games
License: GPL+
@@ -8,13 +8,11 @@ URL: http://www.hedgewars.org/
Source0: http://hedgewars.org/download/hedgewars-src-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
-Patch0: hedgewars-0.9.0-debuginfo.patch
-Patch1: hedgewars-remove-Nu.patch
-Patch2: hedgewars-nolog.patch
+Patch0: hedgewars-compiler-opts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires: SDL_ttf-devel openssl-devel cmake desktop-file-utils
-Requires: dejavu-sans-fonts google-droid-sans-fonts hicolor-icon-theme
+Requires: dejavu-sans-fonts wqy-zenhei-fonts hicolor-icon-theme
# https://bugzilla.redhat.com/show_bug.cgi?id=520400
ExcludeArch: ppc64
@@ -33,26 +31,19 @@ such as the "Rope" or "Parachute", to move to otherwise inaccessible areas.
Summary: Standalone server for hedgewars
Group: Amusements/Games
Requires: %{name}
-Requires: ghc-stm
-Requires: ghc-dataenc
-Requires: ghc-network
-Requires: ghc-utf8-string
BuildRequires: ghc
BuildRequires: ghc-stm-devel
BuildRequires: ghc-dataenc-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-utf8-string-devel
+BuildRequires: ghc-hslogger-devel
%description -n hedgewars-server
A standalone server that can be used for LAN play or a private internet server.
%prep
%setup -q -n %{name}-src-%{version}
-%patch0 -p1
-%patch1
-%patch2
-sed -i "s/-w -O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" CMakeLists.txt
-
+%patch0
%build
%cmake -DWITH_SERVER=1 .
@@ -65,11 +56,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
# replace private font copies with symlinks to system versions
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Data/Fonts/DejaVuSans-Bold.ttf
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Data/Fonts/DroidSansFallback.ttf
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Data/Fonts/wqy-zenhei.ttc
ln -s ../../../fonts/dejavu/DejaVuSans-Bold.ttf \
$RPM_BUILD_ROOT%{_datadir}/%{name}/Data/Fonts/DejaVuSans-Bold.ttf
-ln -s ../../../fonts/google-droid/DroidSansFallback.ttf \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/Data/Fonts/DroidSansFallback.ttf
+ln -s ../../../fonts/wqy-zenhei/wqy-zenhei.ttc \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/Data/Fonts/wqy-zenhei.ttc
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -113,6 +104,10 @@ fi
%changelog
+* Sun Oct 03 2010 Bruno Wolff III <bruno at wolff.to> 0.9.13-1
+- Update to 0.9.13 - Change summary at: http://www.hedgewars.org/node/2037
+- Server logging enable now that ghc-hslogger is available.
+
* Sun Jun 13 2010 Bruno Wolff III <bruno at wolff.to> 0.9.12-4
- In F14 ghc-utf8-string-devel needs to be build required.
diff --git a/sources b/sources
index 9ef23c7..6c7645f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10e9815d19df066b5df074fc2cd08c26 hedgewars-src-0.9.12.tar.bz2
+b91de13d54670970568b56f150cf9fe4 hedgewars-src-0.9.13.tar.bz2
More information about the scm-commits
mailing list