rpms/xine-ui/devel xine-ui.spec,1.19,1.20

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/xine-ui/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30634

Modified Files:
	xine-ui.spec 
Log Message:
fix help crash



Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xine-ui.spec	16 Apr 2010 16:45:12 -0000	1.19
+++ xine-ui.spec	2 May 2010 12:38:03 -0000	1.20
@@ -6,7 +6,7 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.6
-Release:        23%{?dist}
+Release:        25%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
@@ -27,6 +27,8 @@ BuildRequires:	automake
 Patch0:         xine-ui-0.99.5-shared-lirc.patch
 # Patch to use UTF-8 documentation, BZ #512598
 Patch1:         xine-ui-0.99.5-utf8doc.patch
+Patch10:	xine-ui-0.99.6-fix-help-crash.patch
+
 
 #o Sources for -skins. Ugh.
 Source1:	http://xine-project.org/skins/Antares.tar.gz
@@ -60,6 +62,7 @@ Source28:       http://xine-project.org/
 Source29:       http://xine-project.org/skins/Sunset.tar.gz
 Source30:       http://xine-project.org/skins/xinium.tar.gz
 
+Source31:	default.ogv
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Package was named xine in rpmfusion
@@ -136,6 +139,8 @@ touch -r m4/_xine.m4 m4/_xine.m4.stamp
 # and restore it
 touch -r m4/_xine.m4.stamp m4/_xine.m4
 
+%patch10 -p0
+
 # By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora
 # it's provided by libX11-devel => version the dlopen()
 libx11so=$(ls -1 %{_libdir}/libX11.so.? | tail -n 1)
@@ -170,6 +175,9 @@ cp -a src/xitk/xine-toolkit/README doc/R
 find fedoraskins/ -type d -name "CVS" -exec rm -rf {} \; || :
 find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || :
 
+sed -i 's,default.avi,default.ogv,' src/xitk/actions.c
+sed -i 's,default.avi,default.ogv,' misc/visuals/Makefile.in
+
 %build
 ./autogen.sh noconfig
 export LIRC_CFLAGS="-llirc_client"
@@ -190,6 +198,9 @@ desktop-file-install --remove-category="
 # Remove the desktop file installed in the wrong place 
 rm -rf %{buildroot}%{_datadir}/xine/desktop
 
+# Remove the default avi. Gets replaced with default.ogv
+rm -rf %{buildroot}%{_datadir}/xine/visuals/default.avi
+
 # Remove automatically installed documentation (listed in %doc)
 rm -rf %{buildroot}%{_docdir}/
 
@@ -261,6 +272,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/aaxine
 
 %changelog
+* Sun May 02 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.99.6-25
+- fix help crash #579021
+
+* Sun Apr 18 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.99.6-24
+- replaced default.avi with default.ogv #572378
+
 * Fri Apr 16 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.99.6-23
 - subpkg aaxine to prevent xine-lib-extras for xine-ui