[tecnoballz/f15] use tinyxml system library (patch from Debian) fix configure.ac and Makefile.am to include missing f
musuruan
musuruan at fedoraproject.org
Sat Dec 10 14:05:27 UTC 2011
commit 3c1c49ea8f944f31b382bd98f733236ad30eaacb
Author: Andrea Musuruane <musuruan at gmail.com>
Date: Sat Dec 10 15:05:20 2011 +0100
use tinyxml system library (patch from Debian)
fix configure.ac and Makefile.am to include missing files (patches from
Debian)
fix dependencies in configure.ac
tecnoballz-0.92-deps.patch | 230 --------------------------------------------
tecnoballz.spec | 52 +++++++----
2 files changed, 35 insertions(+), 247 deletions(-)
---
diff --git a/tecnoballz.spec b/tecnoballz.spec
index 813e732..b4fd0a6 100644
--- a/tecnoballz.spec
+++ b/tecnoballz.spec
@@ -1,6 +1,6 @@
Name: tecnoballz
Version: 0.92
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A Brick Busting game
Group: Amusements/Games
@@ -9,18 +9,34 @@ URL: http://linux.tlk.fr/games/TecnoballZ/
Source0: http://linux.tlk.fr/games/TecnoballZ/download/%{name}-%{version}.tgz
Source1: %{name}.xpm
Source2: %{name}.desktop
-# SuSE/Gentoo
-Patch0: tecnoballz-0.92-deps.patch
-# Hans de Goede
-Patch1: tecnoballz-0.92-dropsgid.patch
+# Andrea Musuruane
+# Fix dependencies
+Patch0: tecnoballz-0.92-dependecies.patch
+# Andrea Musuruane
+# Don't combine explicit and implicit rules for make 3.82
+# Set correct gamedir for Fedora
+Patch1: tecnoballz-0.92-Makefile.patch
+# Debian
+# Fix configure.ac Makefile.am to include missing files
+Patch2: tecnoballz-0.92-level_data.patch
+Patch3: tecnoballz-0.92-texts_dir.patch
+# Debian
+# Use tinyxml system library
+Patch4: tecnoballz-0.92-tinyxml.patch
# Upstream CVS
-Patch2: tecnoballz-0.92-gcc43.patch
+# Compile with gcc 4.3
+Patch5: tecnoballz-0.92-gcc43.patch
+# Hans de Goede
+# Drop setgid privileges when not needed
+Patch6: tecnoballz-0.92-dropsgid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: mikmod-devel
+BuildRequires: tinyxml-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -37,17 +53,16 @@ complete this great game. This game was ported from the Commodore Amiga.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p2
-
-# FIX: don't combine explicit and implicit rules for make 3.82
-sed -i 's/supervisor.c/supervisor.cc/' src/Makefile.in
-
-# FIX: set gamedir and scoredir
-sed -i 's:gamesdir = $(prefix)/games:gamesdir = ${bindir}:' src/Makefile.in
-sed -i 's:scoredir = /var/games/tecnoballz:scoredir = ${localstatedir}/games/%{name}:' Makefile.in
+%patch2 -p1
+%patch3 -p1
+# Patch4 must be called after Patch0
+%patch4 -p1
+%patch5 -p2
+%patch6 -p1
%build
+autoreconf -fvi
%configure
# FIX: ovverride CXXFLAGS to pick up RPM_OPT_FLAGS
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
@@ -57,9 +72,6 @@ make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-# FIX: install missing files
-cp -fr src/TecnoballZ/levels-data.xml src/TecnoballZ/texts %{buildroot}%{_datadir}/%{name}
-
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
@@ -102,6 +114,12 @@ fi
%changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan at gmail.com> 0.92-11
+- use tinyxml system library (patch from Debian)
+- fix configure.ac and Makefile.am to include missing files (patches from
+ Debian)
+- fix dependencies in configure.ac
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.92-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list