rpms/vbam/devel vbam-1.8.0.1228-includedir.patch, 1.1, 1.2 vbam.spec, 1.11, 1.12
Author: jem256
Update of /cvs/free/rpms/vbam/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3143/devel
Modified Files:
vbam-1.8.0.1228-includedir.patch vbam.spec
Log Message:
Update Devel patch
vbam-1.8.0.1228-includedir.patch:
CMakeLists.txt | 1 +
CMakeScripts/FindSFML.cmake | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Index: vbam-1.8.0.1228-includedir.patch
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/vbam-1.8.0.1228-includedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vbam-1.8.0.1228-includedir.patch 18 Nov 2013 04:47:25 -0000 1.1
+++ vbam-1.8.0.1228-includedir.patch 18 Nov 2013 13:07:24 -0000 1.2
@@ -21,3 +21,12 @@
/usr/local/include
/usr/include
/sw/include/SFML # Fink
+@@ -49,7 +49,7 @@ FOREACH(COMPONENT ${SFML_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ STRING(TOLOWER ${COMPONENT} LOWERCOMPONENT)
+ FIND_LIBRARY(SFML_${UPPERCOMPONENT}_LIBRARY
+- NAMES sfml-${LOWERCOMPONENT}
++ NAMES sfml-${LOWERCOMPONENT}-1.6
+ HINTS
+ $ENV{SFMLDIR}
+ PATH_SUFFIXES lib64 lib
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/vbam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vbam.spec 18 Nov 2013 04:47:25 -0000 1.11
+++ vbam.spec 18 Nov 2013 13:07:24 -0000 1.12
@@ -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: 2%{?dist}
+Release: 3%{?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,7 +10,7 @@
#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):
+#Kudos to Michael Schwendt and Hans de Goede (updates paths for compat-SFML16-devel):
Patch0: %{name}-%{version}-includedir.patch
BuildRequires: SDL-devel
BuildRequires: zip
@@ -134,6 +134,9 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Nov 18 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1228-3
+- Update patch for SFML, thanks to Hans de Goede
+
* Sun Nov 17 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1228-2
- Added patch for SFML