rpms/vbam/F-20 vbam-1.8.0.1229-includedir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vbam.spec, 1.12, 1.13 vbam-1.8.0.1228-includedir.patch, 1.2, NONE

[Jeremy Newton]

Author: jem256

Update of /cvs/free/rpms/vbam/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8280/F-20

Modified Files:
	.cvsignore sources vbam.spec 
Added Files:
	vbam-1.8.0.1229-includedir.patch 
Removed Files:
	vbam-1.8.0.1228-includedir.patch 
Log Message:
New upstream


vbam-1.8.0.1229-includedir.patch:
 CMakeLists.txt              |    1 +
 CMakeScripts/FindSFML.cmake |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE vbam-1.8.0.1229-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 
@@ -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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vbam/F-20/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Nov 2013 04:37:13 -0000	1.6
+++ .cvsignore	5 Apr 2014 14:06:54 -0000	1.7
@@ -1 +1 @@
-vbam-1.8.0.1228.tar.xz
+vbam-1.8.0.1229.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vbam/F-20/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Nov 2013 04:37:13 -0000	1.6
+++ sources	5 Apr 2014 14:06:54 -0000	1.7
@@ -1 +1 @@
-89edc6b112391ade1fb96ad9604e0c2a  vbam-1.8.0.1228.tar.xz
+5b2989d38d71a20e8b9027abb7da2cae  vbam-1.8.0.1229.tar.xz


Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-20/vbam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vbam.spec	18 Nov 2013 13:07:24 -0000	1.12
+++ vbam.spec	5 Apr 2014 14:06:54 -0000	1.13
@@ -1,14 +1,15 @@
 Name:           vbam
-#Pre-release version 1.8.0.1228 is a snapshot of svn 1228
-Version:        1.8.0.1228
-Release:        3%{?dist}
+#Pre-release version 1.8.0.1228 is a snapshot of svn 1229
+Version:        1.8.0.1229
+Release:        1%{?dist}
 #Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
 Summary:        High compatibility Gameboy Advance Emulator combining VBA developments
 
 License:        GPLv2
 Url:            http://www.vba-m.com
-#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}
+#Grab code using:
+#svn co svn://svn.code.sf.net/p/vbam/code/trunk -r 1229 vbam-1.8.0.1229
+#tar -Jcv --exclude-vcs -f vbam-1.8.0.1229.tar.xz vbam-1.8.0.1229
 Source:         vbam-%{version}.tar.xz
 #Kudos to Michael Schwendt and Hans de Goede (updates paths for compat-SFML16-devel):
 Patch0:         %{name}-%{version}-includedir.patch
@@ -35,9 +36,7 @@
 Requires:       %{name}-common
 #According to upstream, WX interface is currently not supported and should not be used yet
 #See revision 1061: http://vba-m.com/forum/Thread-visualboyadvance-m-svn-1085?pid=4823#pid4823
-Provides:       %{name}-wx = %{version}-%{release}
 Obsoletes:      %{name}-wx < 1.8.0.1097-1
-Provides:       %{name}-gui-common = %{version}-%{release}
 Obsoletes:      %{name}-gui-common < 1.8.0.1097-1
 
 %package        sdl
@@ -134,6 +133,9 @@
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Sat Apr 5 2014 Jeremy Newton <alexjnewt at hotmail.com> - 1.8.0.1229-1
+- Update to latest "release" version
+
 * Mon Nov 18 2013 Jeremy Newton <alexjnewt at hotmail.com> - 1.8.0.1228-3
 - Update patch for SFML, thanks to Hans de Goede
 


--- vbam-1.8.0.1228-includedir.patch DELETED ---