From 298b9d74b7a0a8c62f2419c0ed5529632cf6498f Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Dec 15 2013 13:43:02 +0000 Subject: update to 0.4.7 - drop patch, it was upstreamed --- diff --git a/.gitignore b/.gitignore index e704af8..156d76a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ opengfx-0.2.4-source.tar.gz /opengfx-0.4.4-source.tar.xz /opengfx-0.4.5-source.tar.xz /opengfx-0.4.6.1-source.tar.xz +/opengfx-0.4.7-source.tar.xz diff --git a/opengfx-0.4.6.1-gcc-4.8.patch b/opengfx-0.4.6.1-gcc-4.8.patch deleted file mode 100644 index 12a7683..0000000 --- a/opengfx-0.4.6.1-gcc-4.8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru opengfx-0.4.6.1-source.orig/scripts/Makefile.def opengfx-0.4.6.1-source/scripts/Makefile.def ---- opengfx-0.4.6.1-source.orig/scripts/Makefile.def 2013-03-23 11:46:36.003847495 +0100 -+++ opengfx-0.4.6.1-source/scripts/Makefile.def 2013-03-23 11:47:24.699945875 +0100 -@@ -14,7 +14,7 @@ - - - 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 127cd5a..18d97d1 100644 --- a/openttd-opengfx.spec +++ b/openttd-opengfx.spec @@ -2,16 +2,14 @@ #global prever alpha6 Name: openttd-opengfx -Version: 0.4.6.1 -Release: 4%{?prever:.%{prever}}%{?dist} +Version: 0.4.7 +Release: 1%{?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 -# Fix compilation on F19+ -Patch0: opengfx-0.4.6.1-gcc-4.8.patch BuildArch: noarch @@ -33,7 +31,6 @@ to improve the graphics. %prep %setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source -%patch0 -p1 cat >> Makefile.local << EOF DO_NOT_INSTALL_DOCS = 1 @@ -62,6 +59,10 @@ make check %changelog +* Sun Dec 15 2013 Felix Kaechele - 0.4.7-1 +- update to 0.4.7 +- drop patch, it was upstreamed + * Sat Aug 03 2013 Fedora Release Engineering - 0.4.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 2e72d64..d5c7469 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47e4490b7ba3bc664427ee388a1e7025 opengfx-0.4.6.1-source.tar.xz +7b09917405da8ab39a9f5958b95ac126 opengfx-0.4.7-source.tar.xz