[gxine] Update to 0.5.907.
Martin Sourada
mso at fedoraproject.org
Wed Feb 22 14:41:13 UTC 2012
commit 13b308a43130c00ce9af843464b7a74735cc04d8
Author: Martin Sourada <mso at fedoraproject.org>
Date: Wed Feb 22 15:36:41 2012 +0100
Update to 0.5.907.
.gitignore | 1 +
gxine-0.5.905-desktop.patch | 12 -
gxine-0.5.905-js.patch | 477 --------------------
gxine-0.5.905-dso.patch => gxine-0.5.907-dso.patch | 24 +-
...-0.5.905-lirc.patch => gxine-0.5.907-lirc.patch | 14 +-
gxine.spec | 29 +-
sources | 2 +-
7 files changed, 32 insertions(+), 527 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9e11d1..5e5773a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gxine-0.5.905.tar.bz2
+/gxine-0.5.907.tar.xz
diff --git a/gxine-0.5.905-dso.patch b/gxine-0.5.907-dso.patch
similarity index 58%
rename from gxine-0.5.905-dso.patch
rename to gxine-0.5.907-dso.patch
index 01d1466..2f136ed 100644
--- a/gxine-0.5.905-dso.patch
+++ b/gxine-0.5.907-dso.patch
@@ -1,7 +1,7 @@
-diff -up gxine-0.5.905/src/Makefile.am.dso gxine-0.5.905/src/Makefile.am
---- gxine-0.5.905/src/Makefile.am.dso 2010-02-13 21:54:02.000000000 +0100
-+++ gxine-0.5.905/src/Makefile.am 2010-02-13 21:54:08.000000000 +0100
-@@ -51,7 +51,8 @@ gxine_SOURCES = \
+diff -up gxine-0.5.907/src/Makefile.am.dso gxine-0.5.907/src/Makefile.am
+--- gxine-0.5.907/src/Makefile.am.dso 2012-02-01 21:14:37.000000000 +0100
++++ gxine-0.5.907/src/Makefile.am 2012-02-22 14:12:51.941144272 +0100
+@@ -53,7 +53,8 @@ gxine_SOURCES = \
gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
$(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
$(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \
@@ -11,16 +11,10 @@ diff -up gxine-0.5.905/src/Makefile.am.dso gxine-0.5.905/src/Makefile.am
gxine_client_SOURCES = client.c console_output.c
-diff -up gxine-0.5.905/src/Makefile.in.dso gxine-0.5.905/src/Makefile.in
---- gxine-0.5.905/src/Makefile.in.dso 2010-02-13 21:54:30.000000000 +0100
-+++ gxine-0.5.905/src/Makefile.in 2010-02-13 21:55:07.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -217,7 +217,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+diff -up gxine-0.5.907/src/Makefile.in.dso gxine-0.5.907/src/Makefile.in
+--- gxine-0.5.907/src/Makefile.in.dso 2012-02-20 20:10:20.000000000 +0100
++++ gxine-0.5.907/src/Makefile.in 2012-02-22 14:12:51.942144259 +0100
+@@ -236,7 +236,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -28,7 +22,7 @@ diff -up gxine-0.5.905/src/Makefile.in.dso gxine-0.5.905/src/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_CFLAGS = @PANGO_CFLAGS@
PANGO_LIBS = @PANGO_LIBS@
-@@ -355,7 +354,8 @@ gxine_SOURCES = \
+@@ -377,7 +376,8 @@ gxine_SOURCES = \
gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
$(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
$(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \
diff --git a/gxine-0.5.905-lirc.patch b/gxine-0.5.907-lirc.patch
similarity index 54%
rename from gxine-0.5.905-lirc.patch
rename to gxine-0.5.907-lirc.patch
index 312d2ad..79deeab 100644
--- a/gxine-0.5.905-lirc.patch
+++ b/gxine-0.5.907-lirc.patch
@@ -1,16 +1,16 @@
-diff -up gxine-0.5.905/configure.lirc gxine-0.5.905/configure
---- gxine-0.5.905/configure.lirc 2010-01-01 21:17:59.000000000 +0100
-+++ gxine-0.5.905/configure 2010-01-01 21:18:40.000000000 +0100
-@@ -17178,10 +17178,10 @@ fi
- if test "$have_lirc" = "yes"; then
+diff -up gxine-0.5.907/configure.lirc gxine-0.5.907/configure
+--- gxine-0.5.907/configure.lirc 2012-02-20 20:10:20.000000000 +0100
++++ gxine-0.5.907/configure 2012-02-22 14:11:53.873870212 +0100
+@@ -18463,10 +18463,10 @@ fi
+ if test "$found_lirc" = no -a x"$cross_compiling" != xyes; then
if test x"$LIRC_PREFIX" != "x"; then
- lirc_libprefix="$LIRC_PREFIX/lib"
-+ lirc_libprefix="$LIRC_PREFIX/${libdir}"
++ lirc_libprefix="$LIRC_PREFIX/$(libdir)"
LIRC_INCLUDE="-I$LIRC_PREFIX/include"
fi
- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
-+ for llirc in $lirc_libprefix ${libdir}; do
++ for llirc in $lirc_libprefix $(libdir); do
as_ac_File=`$as_echo "ac_cv_file_"$llirc/liblirc_client.so"" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$llirc/liblirc_client.so\"" >&5
$as_echo_n "checking for \"$llirc/liblirc_client.so\"... " >&6; }
diff --git a/gxine.spec b/gxine.spec
index f8a14c5..87c2739 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -1,20 +1,18 @@
Name: gxine
-Version: 0.5.905
-Release: 7%{?dist}
+Version: 0.5.907
+Release: 1%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
License: GPLv2+
URL: http://xinehq.de/
-Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: gxine-0.5.902-non-separate-toolbar.patch
-Patch2: gxine-0.5.905-desktop.patch
# some multilib issues
-Patch3: gxine-0.5.905-lirc.patch
-Patch4: gxine-0.5.905-dso.patch
-Patch5: gxine-0.5.905-js.patch
+Patch3: gxine-0.5.907-lirc.patch
+Patch4: gxine-0.5.907-dso.patch
BuildRequires: js-devel
BuildRequires: desktop-file-utils
@@ -53,15 +51,12 @@ This plugin allows gxine to be embedded in a web browser.
%setup -q
%patch1 -p1 -b .non-separate-toolbar
-%patch2 -p1 -b .desktop
%patch3 -p1 -b .lirc
%patch4 -p1 -b .dso
-%patch5 -p1 -b .js
-%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop.in
-%{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop.in
+%{__sed} -i 's/Name=gxine/Name=GXine/' gxine.desktop.in
-# I'm not sure why we have different name for it in Fedora but it is
+# I'm not sure why we have different name for it in Fedora but it is
# javascript from mozilla... So patching configure to detect it.
%{__sed} -i 's/mozilla-js/libjs/' ./configure
@@ -71,7 +66,7 @@ This plugin allows gxine to be embedded in a web browser.
%configure --with-dbus --with-logo-format=image --with-gudev \
--with-browser-plugin --disable-integration-wizard \
--enable-watchdog --disable-own-playlist-parsers \
- --disable-deprecated
+ --disable-deprecated
make %{?_smp_mflags}
@@ -129,6 +124,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
+* Wed Feb 22 2012 Martin Sourada <mso at fedoraproject.org> - 0.5.907-1
+- Update to 0.5.907
+- Drop .desktop and JS patches -- fixed upstream.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.905-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -230,7 +229,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
- fix rpmlint warning
* Wed Mar 14 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-2
-- add patch to keep track of window state (backport from 0.6.0 branch)
+- add patch to keep track of window state (backport from 0.6.0 branch)
* Thu Feb 01 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-1
- Bump to new (bugfix) release
@@ -277,7 +276,7 @@ ambiguous
* Tue Oct 31 2006 Mola Pahnadayan <mola at c100c.com> - 0.5.8-2
- rm non-free logo
-- add patch to install free-logo
+- add patch to install free-logo
- uses %%find_lang
* Tue Oct 31 2006 Mola Pahnadayan <mola at c100c.com> - 0.5.8-1
diff --git a/sources b/sources
index 5da243e..6849ba5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c9092f1c5c8dc85e95ca327cdcc77af gxine-0.5.905.tar.bz2
+da83ba0e0e8794465b60419009029d2c gxine-0.5.907.tar.xz
More information about the scm-commits
mailing list