[scummvm] new upstream release (BZ 1144386)

[Christian Krause]

commit 8d37808f54fb2f0e35f0d14ef33f841d71ed70c3
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Nov 9 22:56:14 2014 +0100

    new upstream release (BZ 1144386)
    
    - added patch to work-around the currently broken freetype-config script
      (BZ 1161963)
    - added libjpg-devel to BuildRequires

 .gitignore                    |    1 +
 scummvm-1.7.0-freetype2.patch |   14 ++++++++++++++
 scummvm.spec                  |   15 ++++++++++++---
 sources                       |    2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d6a101..cb05a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ scummvm-icons.tar.gz
 /scummvm-1.4.1.tar.bz2
 /scummvm-1.5.0.tar.bz2
 /scummvm-1.6.0.tar.bz2
+/scummvm-1.7.0.tar.bz2
diff --git a/scummvm-1.7.0-freetype2.patch b/scummvm-1.7.0-freetype2.patch
new file mode 100644
index 0000000..05ca058
--- /dev/null
+++ b/scummvm-1.7.0-freetype2.patch
@@ -0,0 +1,14 @@
+diff -uNr scummvm-1.7.0.old/configure scummvm-1.7.0/configure
+--- scummvm-1.7.0.old/configure	2014-07-11 23:10:26.000000000 +0200
++++ scummvm-1.7.0/configure	2014-11-09 22:22:37.825355055 +0100
+@@ -3878,8 +3878,8 @@
+ 	if test -z "$_freetypeconfig"; then
+ 		_freetype2=no
+ 	else
+-		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
+-		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
++		FREETYPE2_LIBS=`pkg-config --libs freetype2`
++		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
+ 
+ 		if test "$_freetype2" = "auto"; then
+ 			_freetype2=no
diff --git a/scummvm.spec b/scummvm.spec
index 1e6ffa1..dfc9790 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,15 +1,17 @@
 Name:		scummvm
-Version:	1.6.0
-Release:	4%{?dist}
+Version:	1.7.0
+Release:	1%{?dist}
 Summary:	Interpreter for several adventure games
 Group:		Applications/Emulators
 License:	GPLv2+
 URL:		http://scummvm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# Substitute freetype-config with plain pkg-config call (BZ 1161963)
+Patch0:		scummvm-1.7.0-freetype2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:	fluidsynth-devel desktop-file-utils libtheora-devel
-BuildRequires:	libpng-devel freetype-devel
+BuildRequires:	libpng-devel freetype-devel libjpeg-devel
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
@@ -34,6 +36,7 @@ http://scummvm.org/compatibility/%{version}/
 
 %prep
 %setup -q
+%patch0 -p1 -b.freetype2
 sed -i 's/%{name}.xpm/%{name}/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
 	dists/%{name}.desktop
@@ -97,6 +100,12 @@ fi
 
 
 %changelog
+* Sun Nov 09 2014 Christian Krause <chkr at fedoraproject.org> - 1.7.0-1
+- new upstream release (BZ 1144386)
+- added patch to work-around the currently broken freetype-config script
+  (BZ 1161963)
+- added libjpg-devel to BuildRequires
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 1443d2e..02030c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-473c151ff44e3db7b603ecacd800a0d2  scummvm-1.6.0.tar.bz2
+be91bf3fa2f1b44a82c92cfe8c5cc1c8  scummvm-1.7.0.tar.bz2