Author: jem256 Update of /cvs/free/rpms/vbam/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22711/devel Modified Files: vbam.spec Added Files: vbam-1.8.0.1228-includedir.patch Log Message: Minor fix for Devel vbam-1.8.0.1228-includedir.patch: CMakeLists.txt | 1 + CMakeScripts/FindSFML.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE vbam-1.8.0.1228-includedir.patch --- diff -Nur SOURCE.orig/CMakeLists.txt SOURCE/CMakeLists.txt --- SOURCE.orig/CMakeLists.txt 2012-10-03 20:00:45.000000000 +0200 +++ SOURCE/CMakeLists.txt 2013-10-25 21:07:45.392711376 +0200 @@ -66,6 +66,7 @@ if( ENABLE_LINK ) FIND_PACKAGE ( SFML REQUIRED ) + INCLUDE_DIRECTORIES ( /usr/include/sfml1 ) endif( ENABLE_LINK ) # set the standard libraries all ports use SET(VBAMCORE_LIBS diff -Nur SOURCE.orig/CMakeScripts/FindSFML.cmake SOURCE/CMakeScripts/FindSFML.cmake --- SOURCE.orig/CMakeScripts/FindSFML.cmake 2011-02-20 20:06:05.000000000 +0100 +++ SOURCE/CMakeScripts/FindSFML.cmake 2013-10-25 21:06:56.156359107 +0200 @@ -21,7 +21,7 @@ ~/Library/Frameworks /Library/Frameworks /usr/local/include/SFML - /usr/include/SFML + /usr/include/sfml1/SFML /usr/local/include /usr/include /sw/include/SFML # Fink Index: vbam.spec =================================================================== RCS file: /cvs/free/rpms/vbam/devel/vbam.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vbam.spec 18 Nov 2013 04:37:13 -0000 1.10 +++ vbam.spec 18 Nov 2013 04:47:25 -0000 1.11 @@ -1,7 +1,7 @@ Name: vbam #Pre-release version 1.8.0.1228 is a snapshot of svn 1228 Version: 1.8.0.1228 -Release: 1%{?dist} +Release: 2%{?dist} #Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages Summary: High compatibility Gameboy Advance Emulator combining VBA developments @@ -10,6 +10,8 @@ #Grab code using svn co svn://svn.code.sf.net/p/vbam/code/trunk vbam-%{version} #tar -Jcv --exclude-vcs -f vbam-%{version}.tar.xz vbam-%{version} Source: vbam-%{version}.tar.xz +#Kudos to Michael Schwendt on this one (updates pathes for compat-SFML16-devel): +Patch0: %{name}-%{version}-includedir.patch BuildRequires: SDL-devel BuildRequires: zip BuildRequires: ImageMagick @@ -81,6 +83,7 @@ %prep %setup -q +%patch0 -p1 sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt %build @@ -131,9 +134,11 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Nov 17 2013 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 1.8.0.1228-2 +- Added patch for SFML + * Sun Nov 17 2013 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 1.8.0.1228-1 - Updated to new snapshot version -- Added patch for SFML * Fri Mar 1 2013 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 1.8.0.1159-1 - Updated to new upstream version