Author: glen Date: Thu Sep 16 21:49:03 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- browser plugin deps, paths
- rename plugin as browser-plugin-moonlight
---- Files affected:
packages/mono-moonlight:
mono-moonlight.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/mono-moonlight/mono-moonlight.spec
diff -u packages/mono-moonlight/mono-moonlight.spec:1.9
packages/mono-moonlight/mono-moonlight.spec:1.10
--- packages/mono-moonlight/mono-moonlight.spec:1.9 Thu Sep 16 23:42:42 2010
+++ packages/mono-moonlight/mono-moonlight.spec Thu Sep 16 23:48:58 2010
@@ -34,6 +34,7 @@
BuildRequires: mono-devel >= 2.6
BuildRequires: mono-monodoc
BuildRequires: pulseaudio-devel
+BuildRequires: rpmbuild(macros) >= 1.357
#BuildRequires: rsvg2-sharp
#BuildRequires: wnck-sharp
BuildRequires: xulrunner-devel
@@ -68,14 +69,16 @@
Moonlight is an open source implementation of Microsoft Silverlight
for Unix systems.
-%package plugin
+%package -n browser-plugin-moonlight
Summary: Novell Moonlight Browser Plugin
License: LGPL v2, MIT License (or similar), MS-PL
Group: X11/Applications/Multimedia
+Requires: browser-plugins >= 2.0
Requires: libmoon = %{version}-%{release}
Requires: mono-core >= 2.6
+Obsoletes: mono-moonlight-plugin
-%description plugin
+%description -n browser-plugin-moonlight
Novell Moonlight Browser Plugin.
Moonlight is an open source implementation of Microsoft Silverlight
@@ -205,8 +208,8 @@
DESTDIR=$RPM_BUILD_ROOT
# Symlink the loader into browser-plugins for SUSE
-install -d $RPM_BUILD_ROOT%{_libdir}/browser-plugins
-ln -s %{_libdir}/moonlight/plugin/libmoonloader.so
$RPM_BUILD_ROOT%{_libdir}/browser-plugins/libmoonloader.so
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
+ln -s %{_libdir}/moonlight/plugin/libmoonloader.so
$RPM_BUILD_ROOT%{_browserpluginsdir}/libmoonloader.so
# We don't like nasty .la files
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -v
@@ -217,18 +220,27 @@
%post -n libmoon -p /sbin/ldconfig
%postun -n libmoon -p /sbin/ldconfig
+%post -n browser-plugin-moonlight
+%update_browser_plugins
+
+%postun -n browser-plugin-moonlight
+if [ "$1" = 0 ]; then
+ %update_browser_plugins
+fi
+
%files -n libmoon
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog demo-status.txt LICENSE NEWS README TODO wishlist
-%attr(755,root,root) %{_libdir}/libmoon.so.*
+%doc AUTHORS ChangeLog LICENSE NEWS README TODO
+%attr(755,root,root) %{_libdir}/libmoon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmoon.so.0
%files -n libmoon-devel
%defattr(644,root,root,755)
%{_libdir}/libmoon.so
-%files plugin
+%files -n browser-plugin-moonlight
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/browser-plugins/libmoonloader.so
+%attr(755,root,root) %{_browserpluginsdir}/libmoonloader.so
%dir %{_libdir}/moonlight/plugin
%attr(755,root,root) %{_libdir}/moonlight/plugin/libmoonloader.so
%attr(755,root,root) %{_libdir}/moonlight/plugin/libmoonplugin-ff3bridge.so
@@ -327,6 +339,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2010/09/16 21:48:58 glen
+- browser plugin deps, paths
+- rename plugin as browser-plugin-moonlight
+
Revision 1.9 2010/09/16 21:42:42 glen
- executable bits
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mono-moonlight/mono-moonlight.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
