rpms/vbam/devel .cvsignore,1.3,1.4 sources,1.3,1.4 vbam.spec,1.6,1.7

[Jeremy Newton]

Author: jem256

Update of /cvs/free/rpms/vbam/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2067/devel

Modified Files:
	.cvsignore sources vbam.spec 
Log Message:
Updated to new version, should fix bug#2583



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jul 2012 18:20:13 -0000	1.3
+++ .cvsignore	10 Dec 2012 20:45:49 -0000	1.4
@@ -1 +1 @@
-vbam-1.8.0.1097.tar.xz
+vbam-1.8.0.1149.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jul 2012 18:20:13 -0000	1.3
+++ sources	10 Dec 2012 20:45:49 -0000	1.4
@@ -1 +1 @@
-34aa21848c996d499454028ad8a11b30  vbam-1.8.0.1097.tar.xz
+4d6efcce9664942ae9a569d63b8c099d  vbam-1.8.0.1149.tar.xz


Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/vbam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vbam.spec	24 Nov 2012 15:24:19 -0000	1.6
+++ vbam.spec	10 Dec 2012 20:45:49 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           vbam
-#Pre-release version 1.8.0.1097 is a snapshot of svn 1097
-Version:        1.8.0.1097
-Release:        3%{?dist}
+#Pre-release version 1.8.0.1149 is a snapshot of svn 1149
+Version:        1.8.0.1149
+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
 ##To download source run these commands:
-#svn co -r 1097 https://vbam.svn.sourceforge.net/svnroot/vbam vbam-temp
-#cd vbam-temp && rm -r -f trunk/project && mv trunk vbam-1.8.0.1097
-#tar -Jcv --exclude-vcs -f ../vbam-1.8.0.1097.tar.xz vbam-1.8.0.1097
+#svn co -r 1149 https://vbam.svn.sourceforge.net/svnroot/vbam vbam-temp
+#cd vbam-temp && rm -r -f trunk/project && mv trunk vbam-1.8.0.1149
+#tar -Jcv --exclude-vcs -f ../vbam-1.8.0.1149.tar.xz vbam-1.8.0.1149
 #cd .. && rm -r -f vbam-temp
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  SDL-devel
@@ -28,7 +28,6 @@
 BuildRequires:  gtkglextmm-devel
 BuildRequires:  gtkmm24-devel
 BuildRequires:  cairo-devel
-BuildRequires:  ffmpeg-devel
 BuildRequires:  SFML-devel
 BuildRequires:  openal-soft-devel
 
@@ -89,9 +88,7 @@
 
 %build
 %cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DVERSION=%{version} -DCMAKE_SKIP_RPATH=ON -DENABLE_LINK=ON
-#Required for ffmpeg header to build
-export CPATH='/usr/include/ffmpeg'
-#Needed for rpmfusion build servers
+#V=1 Needed for rpmfusion build servers
 make V=1
 
 %install
@@ -137,11 +134,9 @@
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
-* Sat Nov 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.8.0.1097-3
-- Rebuilt for FFmpeg 1.0
-
-* Sun Jul 15 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.8.0.1097-2
-- Minor change to fix build issues
+* Mon Dec 10 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.8.0.1149-1
+- Updated to new upstream version
+- FFMpeg dep removed due to only needed by wx and now disabled by default
 
 * Thu Jul 5 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.8.0.1097-1
 - Updated to new upstream version