Author: arekm Date: Sat May 29 22:49:28 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; package skypebuttons browser plugin; protocol skype package makes sense only on where skype is available (x86 and x8664 in multiarch case); skype plugin R skype program
---- Files affected: packages/kde4-kdenetwork: kde4-kdenetwork.spec (1.109 -> 1.110) ---- Diffs: ================================================================ Index: packages/kde4-kdenetwork/kde4-kdenetwork.spec diff -u packages/kde4-kdenetwork/kde4-kdenetwork.spec:1.109 packages/kde4-kdenetwork/kde4-kdenetwork.spec:1.110 --- packages/kde4-kdenetwork/kde4-kdenetwork.spec:1.109 Sun May 30 00:21:53 2010 +++ packages/kde4-kdenetwork/kde4-kdenetwork.spec Sun May 30 00:49:23 2010 @@ -16,7 +16,7 @@ Summary(pt_BR.UTF-8): K Desktop Environment - aplicações de rede Name: kde4-kdenetwork Version: 4.4.4 -Release: 2 +Release: 3 License: GPL v2+ Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 @@ -395,6 +395,8 @@ Summary(pl.UTF-8): Wtyczka Kopete dodająca obsługę protokołu Skype(tm) Group: X11/Applications/Networking Requires: %{name}-kopete = %{version}-%{release} +Requires: browser-plugins >= 2.0 +Requires: skype-program %description kopete-protocol-skype Kopete plugin which adds Skype(tm) protocol support. @@ -753,6 +755,7 @@ -DLIB_INSTALL_DIR=%{_libdir} \ -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ + -DMOZPLUGIN_INSTALL_DIR=%{_browserpluginsdir} \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif @@ -791,6 +794,14 @@ %post krfb -p /sbin/ldconfig %postun krfb -p /sbin/ldconfig +%post kopete-protocol-skype +%update_browser_plugins + +%postun kopete-protocol-skype +if [ "$1" = 0 ]; then + %update_browser_plugins +fi + %files libkopete %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libkopete.so.*.*.* @@ -1116,11 +1127,11 @@ %dir %{_datadir}/apps/kopete_wlm %{_datadir}/apps/kopete_wlm/wlmchatui.rc +# skype exists only for ix86 (and can be used in multiarch env) +%ifarch %{ix86} %{x8664} %files kopete-protocol-skype %defattr(644,root,root,755) -#%attr(755,root,root) %{_bindir}/skype-action-handler -# someone find a way to package this -#%{_prefix}/lib/mozilla/plugins/libskypebuttons.so +%attr(755,root,root) %{_browserpluginsdir}/skypebuttons.so %attr(755,root,root) %{_libdir}/kde4/kopete_skype.so %dir %{_datadir}/apps/kopete_skype %{_datadir}/apps/kopete_skype/skypechatui.rc @@ -1130,6 +1141,7 @@ %{_datadir}/kde4/services/skype.protocol %{_datadir}/kde4/services/tel.protocol %{_datadir}/apps/kopete/icons/*/*/*/skype_protocol.png +%endif %files kopete-protocol-sms %defattr(644,root,root,755) @@ -1299,6 +1311,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.110 2010/05/29 22:49:23 arekm +- rel 3; package skypebuttons browser plugin; protocol skype package makes sense only on where skype is available (x86 and x8664 in multiarch case); skype plugin R skype program + Revision 1.109 2010/05/29 22:21:53 shadzik - change R to telepathy-mission-control - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork.spec?r1=1.109&r2=1.110&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
