rpms/gxine/devel gxine.spec,1.15,1.16
Martin Sourada (mso)
fedora-extras-commits at redhat.com
Mon Dec 10 18:21:20 UTC 2007
Author: mso
Update of /cvs/extras/rpms/gxine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5514/devel
Modified Files:
gxine.spec
Log Message:
Cleanup spec, prepare for EPEL.
Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gxine.spec 21 Nov 2007 13:40:19 -0000 1.15
+++ gxine.spec 10 Dec 2007 18:20:43 -0000 1.16
@@ -1,11 +1,16 @@
-%define use_xulrunner_js 1
-%define gecko_dev_ver 1.9
-%define gecko_libs_ver %{gecko_dev_ver}b2pre
-%define xul_mozjs_path %{_libdir}/xulrunner-%{gecko_libs_ver}
+%if 0%{?fedora} >= 8
+ %define use_xulrunner_js 1
+ %define gecko_dev_ver 1.9
+ %define gecko_libs_ver %{gecko_dev_ver}b2pre
+%else
+ %define use_xulrunner_js 0
+%endif
+
+
Name: gxine
Version: 0.5.11
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
@@ -52,7 +57,11 @@
Summary: Mozilla plugin for gxine
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
+%if 0%{?use_xulrunner_js}
Requires: xulrunner
+%else
+Requires: %{_libdir}/mozilla/plugins
+%endif
%description mozplugin
This plugin allows gxine to be embedded in a web browser.
@@ -63,30 +72,18 @@
%patch0 -p1 -b .lirc
%patch1 -p1 -b .keep-wnd-state
-#until jsapi.h and jsstr.h are moved to stable we need this workaround
-%if 0%{?use_xulrunner_js}
-%{__sed} -i 's at jsapi.h@../js/jsapi.h@' src/*.*
-%{__sed} -i 's at jsstr.h@../js/jsstr.h@' src/*.*
-%endif
-
%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop
%{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop
%build
%configure --with-dbus --with-logo-format=image --with-browser-plugin --disable-integration-wizard
-#%if 0%{?use_xulrunner_js}
-#%{__sed} -i 's at LDFLAGS = -Wl,--as-needed at LDFLAGS = -Wl,--as-needed,--rpath=%{xul_mozjs_path}@' src/Makefile
-#%endif
-
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-#%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_datadir}/gxine/
-#%{__rm} -rf %{buildroot}%{_datadir}/gxine/logo.mpv
# Remove .las
%{__rm} %{buildroot}%{_libdir}/gxine/*.la
@@ -95,8 +92,8 @@
mkdir -p %{buildroot}%{_libdir}/mozilla/plugins/
mv %{buildroot}%{_libdir}/gxine/gxineplugin.so %{buildroot}%{_libdir}/mozilla/plugins/
# Not supported yet - check bz #213041
-# %find_lang %{name} --all-name
-/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
+%find_lang %{name} --all-name
+#/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
desktop-file-install --vendor="fedora" --delete-original \
--dir %{buildroot}%{_datadir}/applications \
@@ -137,10 +134,13 @@
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
+* Mon Dec 10 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-13
+- spec cleanup
+- prepare for EPEL
+
* Wed Nov 21 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-12
- --rpath hack hopefully no longer needed
- build against new xulrunner
-- fix path for xulrunner to use %%{libdir}
* Thu Nov 15 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-11
- add --rpath to xulruner dir, so that libmozjs.so loads correctly
More information about the fedora-extras-commits
mailing list