rpms/gxine/F-12 gxine-0.5.905-desktop.patch, NONE, 1.1 gxine-0.5.905-lirc.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gxine.spec, 1.29, 1.30 sources, 1.4, 1.5 gxine-0.5.11-keep-wnd-state.patch, 1.1, NONE gxine-0.5.11-xine-version-check.patch, 1.1, NONE gxine-0.5.8-lirc.patch, 1.1, NONE

[Martin Sourada]

Author: mso

Update of /cvs/pkgs/rpms/gxine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26066/F-12

Modified Files:
	.cvsignore gxine.spec sources 
Added Files:
	gxine-0.5.905-desktop.patch gxine-0.5.905-lirc.patch 
Removed Files:
	gxine-0.5.11-keep-wnd-state.patch 
	gxine-0.5.11-xine-version-check.patch gxine-0.5.8-lirc.patch 
Log Message:


sync f-11/12 with devel.



gxine-0.5.905-desktop.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gxine-0.5.905-desktop.patch ---
diff -up gxine-0.5.905/Makefile.in.desktop gxine-0.5.905/Makefile.in
--- gxine-0.5.905/Makefile.in.desktop	2010-01-01 20:53:14.000000000 +0100
+++ gxine-0.5.905/Makefile.in	2010-01-01 20:53:23.000000000 +0100
@@ -887,7 +887,7 @@ translator: dist-pre
 	$(MAKE) -C $(top_builddir)/misc/po update-po
 
 @XINE_LIST_TRUE at gxine.desktop: gxine.desktop.in @XINE_LIST@
- at XINE_LIST_TRUE@	exec > $@; $(XINE_MIME_PROCESS) $<; @XINE_LIST@; cat $(srcdir)/mime.extra
+ at XINE_LIST_TRUE@	exec > $@; $(XINE_MIME_PROCESS) $<; @XINE_LIST@; cat $(srcdir)/mime.extra | awk 'BEGIN { s = "%s;" } { printf s, $$1; s = "%s;" }'
 @XINE_LIST_FALSE at gxine.desktop: gxine.desktop.in $(MIME)
 @XINE_LIST_FALSE@	exec > $@; \
 @XINE_LIST_FALSE@	$(XINE_MIME_PROCESS) $<; \

gxine-0.5.905-lirc.patch:
 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gxine-0.5.905-lirc.patch ---
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
 
         if test x"$LIRC_PREFIX" != "x"; then
-           lirc_libprefix="$LIRC_PREFIX/lib"
+           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
           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; }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Jun 2008 15:56:32 -0000	1.4
+++ .cvsignore	1 Jan 2010 20:57:49 -0000	1.5
@@ -1 +1 @@
-gxine-0.5.903.tar.bz2
+gxine-0.5.905.tar.bz2


Index: gxine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/F-12/gxine.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gxine.spec	25 Jul 2009 01:57:35 -0000	1.29
+++ gxine.spec	1 Jan 2010 20:57:50 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gxine
-Version:        0.5.903
-Release:        4%{?dist}
+Version:        0.5.905
+Release:        1%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -9,10 +9,10 @@ URL:            http://xinehq.de/
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/xine/%{name}-%{version}.tar.bz2
 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
-Patch3:         gxine-0.5.902-non-separate-toolbar.patch
+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
 
 BuildRequires:  gecko-devel
 BuildRequires:  desktop-file-utils
@@ -50,10 +50,9 @@ This plugin allows gxine to be embedded 
 %prep
 %setup -q
 
-%patch0 -p1 -b .lirc
-#%patch1 -p1 -b .keep-wnd-state
-#%patch2 -p1 -b .xine-version-check
-%patch3 -p1 -b .non-separate-toolbar
+%patch1 -p1 -b .non-separate-toolbar
+%patch2 -p1 -b .desktop
+%patch3 -p1 -b .lirc
 
 %{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop.in
 %{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop.in
@@ -61,8 +60,8 @@ This plugin allows gxine to be embedded 
 %build
 %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
+  --enable-watchdog  --disable-own-playlist-parsers        \
+  --disable-deprecated
 
 make %{?_smp_mflags}
 
@@ -77,12 +76,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Move Mozilla plugin
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins/
 mv %{buildroot}%{_libdir}/gxine/gxineplugin.so %{buildroot}%{_libdir}/mozilla/plugins/
-# Not supported yet - check bz #213041
-%if 0%{?fedora} >= 8
+
 %find_lang %{name} --all-name
-%else
-/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
-%endif
 
 desktop-file-install --vendor="fedora" --delete-original \
   --dir %{buildroot}%{_datadir}/applications             \
@@ -124,6 +119,15 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Fri Jan 01 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.905-1
+- 0.5.905
+- Should fix sigsegv on exit
+- Reenable lirc support (detection fixed upstream)
+
+* Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.5.904-1
+- 0.5.904
+- Disable lirc support (./configure does not find fedora's lirc)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.903-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jun 2008 15:56:32 -0000	1.4
+++ sources	1 Jan 2010 20:57:50 -0000	1.5
@@ -1 +1 @@
-3878ffb159fa5aca093617dab4924e6d  gxine-0.5.903.tar.bz2
+3c9092f1c5c8dc85e95ca327cdcc77af  gxine-0.5.905.tar.bz2


--- gxine-0.5.11-keep-wnd-state.patch DELETED ---


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


--- gxine-0.5.8-lirc.patch DELETED ---