heffer pushed to openttd (master). "update to 1.5.0 (..more)"

[notifications at fedoraproject.org]

>From 1fa7a78072c806160c0c2d4fceb8e2d22f579d72 Mon Sep 17 00:00:00 2001
From: Felix Kaechele <heffer at fedoraproject.org>
Date: Mon, 6 Apr 2015 15:01:44 +0200
Subject: update to 1.5.0

- remove compile patch, fixed upstream

diff --git a/.gitignore b/.gitignore
index cce4e9e..c1caa67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ openttd-1.0.3-source.tar.bz2
 /openttd-1.4.2-source.tar.xz
 /openttd-1.4.3-source.tar.xz
 /openttd-1.4.4-source.tar.xz
+/openttd-1.5.0-source.tar.xz
diff --git a/0001-fix-build.patch b/0001-fix-build.patch
deleted file mode 100644
index 6881644..0000000
--- a/0001-fix-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a8cea91036540981f2ef1da4a08f52b3a008643a Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Tue, 27 Jan 2015 21:30:30 +0100
-Subject: [PATCH] fix build
-
----
- src/fontcache.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/fontcache.cpp b/src/fontcache.cpp
-index 8b76c0d..b2bda0e 100644
---- a/src/fontcache.cpp
-+++ b/src/fontcache.cpp
-@@ -527,8 +527,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
- 	aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
- 
- 	/* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
--	int width  = max(1, slot->bitmap.width + (this->fs == FS_NORMAL));
--	int height = max(1, slot->bitmap.rows  + (this->fs == FS_NORMAL));
-+	int width  = max(1u, slot->bitmap.width + (this->fs == FS_NORMAL));
-+	int height = max(1u, slot->bitmap.rows  + (this->fs == FS_NORMAL));
- 
- 	/* Limit glyph size to prevent overflows later on. */
- 	if (width > 256 || height > 256) usererror("Font glyph is too large");
--- 
-2.1.0
-
diff --git a/openttd.spec b/openttd.spec
index 0296169..28b16b0 100644
--- a/openttd.spec
+++ b/openttd.spec
@@ -2,8 +2,8 @@
 #%%global prever RC1
 
 Name:           openttd
-Version:        1.4.4
-Release:        3%{?prever}%{?dist}
+Version:        1.5.0
+Release:        1%{?prever}%{?dist}
 Summary:        Transport system simulation game
 
 Group:          Amusements/Games
@@ -17,8 +17,6 @@ BuildRequires:  freetype-devel, xz-devel, ccache, doxygen
 Requires:       hicolor-icon-theme
 Requires:       openttd-opengfx => 0.5.0
 
-Patch0:         0001-fix-build.patch
-
 %description
 OpenTTD is modeled after a popular transportation business simulation game
 by Chris Sawyer and enhances the game experience dramatically. Many features
@@ -39,8 +37,6 @@ the AI.
 %prep
 %setup -q -n %{name}-%{version}%{?prever:-%{prever}}
 
-%patch0 -p1
-
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -149,6 +145,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Apr 05 2015 Felix Kaechele <heffer at fedoraproject.org> - 1.5.0-1
+- update to 1.5.0
+- remove compile patch, fixed upstream
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 1.4.4-3
 - Add an AppData file for the software center
 
diff --git a/sources b/sources
index 22bb6e8..801e18c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-428251bb66a395b76d530ebe1c71697e  openttd-1.4.4-source.tar.xz
+1dc298bb77d31670453dc23ade06b5c6  openttd-1.5.0-source.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openttd.git/commit/?h=master&id=1fa7a78072c806160c0c2d4fceb8e2d22f579d72