rpms/gxine/devel gxine-0.5.902-non-separate-toolbar.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gxine.spec, 1.23, 1.24 sources, 1.2, 1.3

[Martin Sourada (mso)]

Author: mso

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

Modified Files:
	.cvsignore gxine.spec sources 
Added Files:
	gxine-0.5.902-non-separate-toolbar.patch 
Log Message:


New release - 0.5.902.

Drop upstreamed patches, don't use separate toolbar in windowed mode.

Customize configuration options.

Use HAL.



gxine-0.5.902-non-separate-toolbar.patch:

--- NEW FILE gxine-0.5.902-non-separate-toolbar.patch ---
diff -up gxine-0.5.902/src/ui.c.non-separate-toolbar gxine-0.5.902/src/ui.c
--- gxine-0.5.902/src/ui.c.non-separate-toolbar	2008-02-25 18:14:46.000000000 +0100
+++ gxine-0.5.902/src/ui.c	2008-04-22 22:57:14.000000000 +0200
@@ -838,10 +838,10 @@ void ui_preferences_register (xine_t *th
      NULL, 0, NULL, NULL);
 
   xine_config_register_bool
-    (this, "gui.windowed_mode.separate_toolbar", CONFIG_VERSION_ATLEAST (0, 6, 0),
+    (this, "gui.windowed_mode.separate_toolbar", 0,
      _("In windowed mode, whether the toolbar is in a separate window"), NULL,
      0, NULL, NULL);
-  config_update_default ("gui.windowed_mode.separate_toolbar", 1);
+  config_update_default ("gui.windowed_mode.separate_toolbar", 0);
 
   xine_config_register_bool
     (this, "gui.windowed_mode.unblank", CONFIG_VERSION_ATLEAST (0, 6, 0),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 18:06:35 -0000	1.2
+++ .cvsignore	22 Apr 2008 21:04:28 -0000	1.3
@@ -1 +1 @@
-gxine-0.5.11.tar.bz2
+gxine-0.5.902.tar.bz2


Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gxine.spec	9 Feb 2008 12:36:17 -0000	1.23
+++ gxine.spec	22 Apr 2008 21:04:28 -0000	1.24
@@ -16,8 +16,8 @@
 
 
 Name:           gxine
-Version:        0.5.11
-Release:        17%{?dist}
+Version:        0.5.902
+Release:        1%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -27,9 +27,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
-
+#Patch1:         gxine-0.5.11-keep-wnd-state.patch
+#Patch2:         gxine-0.5.11-xine-version-check.patch
+Patch3:         gxine-0.5.902-non-separate-toolbar.patch
 
 %if 0%{?use_xulrunner_js}%{?use_firefox_js}
 BuildRequires:  gecko-devel = %{gecko_dev_ver}
@@ -43,6 +43,8 @@
 
 # for dbus support
 BuildRequires:  dbus-glib-devel
+# for hal support
+BuildRequires:  hal-devel
 # for LIRC support (not available only for fedora)
 %if 0%{?fedora}
 BuildRequires:  lirc-devel
@@ -84,14 +86,18 @@
 %setup -q
 
 %patch0 -p1 -b .lirc
-%patch1 -p1 -b .keep-wnd-state
-%patch2 -p1 -b .xine-version-check
+#%patch1 -p1 -b .keep-wnd-state
+#%patch2 -p1 -b .xine-version-check
+%patch3 -p1 -b .non-separate-toolbar
 
-%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop
-%{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop
+%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop.in
+#%{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop.in
 
 %build
-%configure --with-dbus --with-logo-format=image --with-browser-plugin --disable-integration-wizard
+%configure --with-dbus --with-hal --with-logo-format=image \
+  --with-browser-plugin --disable-integration-wizard       \
+  --disable-gtk-compat --enable-watchdog                   \
+  --disable-own-playlist-parsers --disable-deprecated
 
 make %{?_smp_mflags}
 
@@ -141,6 +147,7 @@
 %{_bindir}/gxine*
 %{_mandir}/man1/gxine*.1*
 %lang(de) %{_mandir}/de/man1/gxine*.1*
+%lang(es) %{_mandir}/es/man1/gxine*.1*
 %{_datadir}/gxine/
 %{_datadir}/pixmaps/gxine.png
 %{_datadir}/icons/*/*/apps/gxine.png
@@ -152,6 +159,14 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Tue Apr 22 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.902-1
+- new upstream version
+- drop xine-lib version patch - fixed in upstream
+- drop keep track of window state patch - fixed in upstream
+- add BR: hal
+- customize configure options
+- do not use spearate toolbar by default
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Mar 2007 18:06:35 -0000	1.2
+++ sources	22 Apr 2008 21:04:28 -0000	1.3
@@ -1 +1 @@
-b210d1f6e3eab3ff496c1db9e09dbcd0  gxine-0.5.11.tar.bz2
+2650bc483975ca5372ff08d299f92dc7  gxine-0.5.902.tar.bz2