[openttd-opengfx/f18] fix compilation on F19+

[Felix Kaechele]

commit 9eca0dde3668b552e5214eb8a39082997ab0a391
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sat Mar 23 10:11:31 2013 +0100

    fix compilation on F19+
    
    - specfile cleanups

 changeset_rbd33fb0e864a.diff |   12 ++++++++++++
 openttd-opengfx.spec         |   18 ++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/changeset_rbd33fb0e864a.diff b/changeset_rbd33fb0e864a.diff
new file mode 100644
index 0000000..637d68d
--- /dev/null
+++ b/changeset_rbd33fb0e864a.diff
@@ -0,0 +1,12 @@
+diff -r 7879e1a16e64 -r bd33fb0e864a scripts/Makefile.def
+--- a/scripts/Makefile.def
++++ b/scripts/Makefile.def
+@@ -16,7 +16,7 @@
+ GRFID_FLAGS    ?= -m
+ 
+ CC             ?= gcc
+-CC_FLAGS       ?= -C -E - <
++CC_FLAGS       ?= -nostdinc -C -E - <
+ 
+ GIMP           ?= $(shell [ `which gimp 2>/dev/null` ] && echo "gimp" || echo "")
+ GIMP_FLAGS     ?= -n -i -b - <
diff --git a/openttd-opengfx.spec b/openttd-opengfx.spec
index 4afec3b..b91b930 100644
--- a/openttd-opengfx.spec
+++ b/openttd-opengfx.spec
@@ -3,14 +3,17 @@
 
 Name:           openttd-opengfx
 Version:        0.4.6.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://dev.openttdcoop.org/projects/opengfx
 Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{version}%{?prever:-%{prever}}/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix compilation on F19+
+# taken from upstream git
+Patch0:         changeset_rbd33fb0e864a.diff
+
 BuildArch:      noarch
 
 BuildRequires:  gimp grfcodec nml
@@ -31,6 +34,7 @@ to improve the graphics.
 
 %prep
 %setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
+%patch0 -p1
 
 cat >> Makefile.local << EOF
 DO_NOT_INSTALL_DOCS = 1
@@ -46,7 +50,6 @@ make clean-gfx
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install INSTALL_DIR=$RPM_BUILD_ROOT%{_datadir}/openttd/data
 
 
@@ -54,17 +57,16 @@ make install INSTALL_DIR=$RPM_BUILD_ROOT%{_datadir}/openttd/data
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc docs/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Sat Mar 23 2013 Felix Kaechele <heffer at fedoraproject.org> - 0.4.6.1-2
+- fix compilation on F19+
+- specfile cleanups
+
 * Thu Mar 14 2013 Felix Kaechele <heffer at fedoraproject.org> - 0.4.6.1-1
 - update to 0.4.6.1
 - remove unix2dos usage during compilation of docs