rpms/gxine/devel gxine-0.5.11-xine-version-check.patch, NONE, 1.1 gxine.spec, 1.22, 1.23

[Martin Sourada (mso)]

Author: mso

Update of /cvs/extras/rpms/gxine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23106

Modified Files:
	gxine.spec 
Added Files:
	gxine-0.5.11-xine-version-check.patch 
Log Message:


Allow build against xine-lib 1.1.10.1.



gxine-0.5.11-xine-version-check.patch:

--- NEW FILE gxine-0.5.11-xine-version-check.patch ---
diff -up gxine-0.5.11/configure.xine-version-check gxine-0.5.11/configure
--- gxine-0.5.11/configure.xine-version-check	2008-02-09 13:29:20.000000000 +0100
+++ gxine-0.5.11/configure	2008-02-09 13:25:50.000000000 +0100
@@ -26968,11 +26968,11 @@ echo $ECHO_N "checking for XINE-LIB vers
       XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs`
       XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags`
       xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \
-             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
       xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \
-             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
       xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
-             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
       xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir`
       xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
       xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`


Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gxine.spec	8 Feb 2008 22:17:59 -0000	1.22
+++ gxine.spec	9 Feb 2008 12:36:17 -0000	1.23
@@ -17,7 +17,7 @@
 
 Name:           gxine
 Version:        0.5.11
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -28,6 +28,7 @@
 
 Patch0:         gxine-0.5.8-lirc.patch
 Patch1:         gxine-0.5.11-keep-wnd-state.patch
+Patch2:         gxine-0.5.11-xine-version-check.patch
 
 
 %if 0%{?use_xulrunner_js}%{?use_firefox_js}
@@ -84,6 +85,7 @@
 
 %patch0 -p1 -b .lirc
 %patch1 -p1 -b .keep-wnd-state
+%patch2 -p1 -b .xine-version-check
 
 %{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop
 %{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop
@@ -150,6 +152,9 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Sat Feb 09 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-17
+- add patch to support x.y.z.w version strings in xine-lib
+
 * Fri Feb 08 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
 - rebuild for gcc 4.3