rpms/gxine/devel gxine-0.5.905-lirc.patch, NONE, 1.1 gxine.spec, 1.31, 1.32 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/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20703

Modified Files:
	gxine.spec 
Added Files:
	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:


remove some old crust, regenerate lirc patch.



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: gxine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gxine.spec	1 Jan 2010 20:12:31 -0000	1.31
+++ gxine.spec	1 Jan 2010 20:23:32 -0000	1.32
@@ -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
@@ -25,7 +25,7 @@ BuildRequires:  dbus-glib-devel
 # for hal support
 BuildRequires:  hal-devel
 # for LIRC support (not available only for fedora)
-#BuildRequires:  lirc-devel
+BuildRequires:  lirc-devel
 # for XTest support
 BuildRequires:  libXtst-devel
 # for mozplugin
@@ -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
+%patch2 -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
@@ -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             \


--- 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 ---