I have made the following changes intended for : CE:MW:Shared / ohm-plugins-misc
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6068 Thank You, rojkov [This message was auto-generated] --- Request # 6068: Messages from BOSS: State: review at 2012-08-24T13:45:38 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rojkov:branches:CE:MW:Shared / ohm-plugins-misc -> CE:MW:Shared / ohm-plugins-misc changes files: -------------- --- ohm-plugins-misc.changes +++ ohm-plugins-misc.changes @@ -0,0 +1,5 @@ +* Thu Aug 23 2012 Dmitry Rozhkov <[email protected]> - 1.1.59 +- Enabled videoep +- Split binary package +- Disable upstart + new: ---- disable-upstart-plugin.patch spec files: ----------- --- ohm-plugins-misc.spec +++ ohm-plugins-misc.spec @@ -18,6 +18,7 @@ Source100: ohm-plugins-misc.yaml Patch0: disable-cgroups-plugin.patch Patch1: resource-Update-resource-set-queue-implementation.patch +Patch2: disable-upstart-plugin.patch Requires: ohm BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11-xcb) @@ -28,6 +29,7 @@ BuildRequires: pkgconfig(libresource) BuildRequires: pkgconfig(ohm) BuildRequires: pkgconfig(libdres) +BuildRequires: pkgconfig(videoipc) BuildRequires: bison BuildRequires: flex @@ -42,6 +44,93 @@ OHM console plugin for debug interface. +%package -n ohm-plugin-videoep +Summary: Video enforcement point for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm +Requires: ohm-plugin-signaling +Requires: xserver-policy-enforcement + +%description -n ohm-plugin-videoep +OHM videoep plugin provides policy enforcement point for | +video. + + +%package -n ohm-plugin-fmradio +Summary: FM radio enforcement point for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm + +%description -n ohm-plugin-fmradio +OHM fmradio plugin provides policy enforcement point for | +FM Radio. + + +%package -n ohm-plugin-dspep +Summary: DSP enforcement point for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm +Requires: ohm-plugin-signaling + +%description -n ohm-plugin-dspep +OHM dspep plugin provides policy enforcement point for | +DSP. + + +%package -n ohm-plugins-dbus +Summary: DBus plugins for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm + +%description -n ohm-plugins-dbus +DBus related plugins for OHM. + +%package -n ohm-plugin-telephony +Summary: Telephony plugin for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm + +%description -n ohm-plugin-telephony +OHM telephony plugin provides policy control points for telephony. + + +%package -n ohm-plugin-signaling +Summary: Signaling plugin for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} + +%description -n ohm-plugin-signaling +OHM signaling plugin provides functionality required by videoep | +and dspep. + + +%package -n ohm-plugin-media +Summary: Media playback enforcement point for OHM +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm + +%description -n ohm-plugin-media +OHM media plugin provides policy enforcement point for | +media playback. + + +%package -n ohm-plugin-accessories +Summary: Sensor OHM plugin for device accessories +Group: System/Resource Policy +Requires: %{name} = %{version}-%{release} +Requires: ohm + +%description -n ohm-plugin-accessories +OHM accessories plugin provides functionality to detect plugged | +in device accessories. + + %prep %setup -q -n maemo-multimedia-%{name} @@ -50,6 +139,8 @@ %patch0 -p1 # resource-Update-resource-set-queue-implementation.patch %patch1 -p1 +# disable-upstart-plugin.patch +%patch2 -p1 # >> setup # << setup @@ -60,7 +151,7 @@ %autogen --disable-static %configure --disable-static \ --enable-telephony \ - --disable-videoep \ + --enable-videoep \ --disable-notification make @@ -86,22 +177,14 @@ %files %defattr(-,root,root,-) # >> files -%{_libdir}/ohm/libohm_accessories.so %{_libdir}/ohm/libohm_auth.so %{_libdir}/ohm/libohm_auth_test.so %{_libdir}/ohm/libohm_delay.so -%{_libdir}/ohm/libohm_fmradio.so %{_libdir}/ohm/libohm_gconf.so -%{_libdir}/ohm/libohm_media.so %{_libdir}/ohm/libohm_resource.so -%{_libdir}/ohm/libohm_signaling.so -%{_libdir}/ohm/libohm_telephony.so -%{_libdir}/ohm/libohm_dbus.so -%{_libdir}/ohm/libohm_dbus_signal.so -%{_libdir}/ohm/libohm_dspep.so -%{_libdir}/ohm/libohm_upstart.so %{_bindir}/ohm-session-agent -%config %{_sysconfdir}/ohm/plugins.d/*.ini +%config %{_sysconfdir}/ohm/plugins.d/auth.ini +%config %{_sysconfdir}/ohm/plugins.d/resource.ini %doc README COPYING AUTHORS #%{_libdir}/ohm/libohm_apptrack.so #%{_libdir}/ohm/libohm_cgroups.so @@ -113,3 +196,54 @@ %{_libdir}/ohm/libohm_console.so %doc COPYING AUTHORS # << files ohm-plugin-console + +%files -n ohm-plugin-videoep +%defattr(-,root,root,-) +# >> files ohm-plugin-videoep +%{_libdir}/ohm/libohm_videoep.so +%config %{_sysconfdir}/ohm/plugins.d/videoep.ini +# << files ohm-plugin-videoep + +%files -n ohm-plugin-fmradio +%defattr(-,root,root,-) +# >> files ohm-plugin-fmradio +%{_libdir}/ohm/libohm_fmradio.so +# << files ohm-plugin-fmradio + +%files -n ohm-plugin-dspep +%defattr(-,root,root,-) +# >> files ohm-plugin-dspep +%{_libdir}/ohm/libohm_dspep.so +# << files ohm-plugin-dspep + +%files -n ohm-plugins-dbus +%defattr(-,root,root,-) +# >> files ohm-plugins-dbus +%{_libdir}/ohm/libohm_dbus.so +%{_libdir}/ohm/libohm_dbus_signal.so +# << files ohm-plugins-dbus + +%files -n ohm-plugin-telephony +%defattr(-,root,root,-) +# >> files ohm-plugin-telephony +%{_libdir}/ohm/libohm_telephony.so +# << files ohm-plugin-telephony + +%files -n ohm-plugin-signaling +%defattr(-,root,root,-) +# >> files ohm-plugin-signaling +%{_libdir}/ohm/libohm_signaling.so +# << files ohm-plugin-signaling + +%files -n ohm-plugin-media +%defattr(-,root,root,-) +# >> files ohm-plugin-media +%{_libdir}/ohm/libohm_media.so +%config %{_sysconfdir}/ohm/plugins.d/media.ini +# << files ohm-plugin-media + +%files -n ohm-plugin-accessories +%defattr(-,root,root,-) +# >> files ohm-plugin-accessories +%{_libdir}/ohm/libohm_accessories.so +# << files ohm-plugin-accessories other changes: -------------- ++++++ disable-upstart-plugin.patch (new) --- disable-upstart-plugin.patch +++ disable-upstart-plugin.patch @@ -0,0 +1,24 @@ +From edfbff7a23dd93acdf86261cb71ac72f634d846c Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov <[email protected]> +Date: Fri, 24 Aug 2012 15:04:46 +0300 +Subject: [PATCH] Don't build upstart plugin + +--- + plugins/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 5e48133..d6e8c0e 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -4,7 +4,6 @@ SUBDIRS = \ + gconf \ + cgroups \ + delay \ +- upstart \ + auth \ + dbus \ + dbus-signal +-- +1.7.9.5 + ++++++ ohm-plugins-misc.yaml --- ohm-plugins-misc.yaml +++ ohm-plugins-misc.yaml @@ -12,6 +12,7 @@ Patches: - disable-cgroups-plugin.patch - resource-Update-resource-set-queue-implementation.patch + - disable-upstart-plugin.patch Requires: - ohm @@ -28,10 +29,11 @@ - libresource - ohm - libdres + - videoipc Configure: autogen ConfigOptions: - --enable-telephony - - --disable-videoep + - --enable-videoep - --disable-notification # for now (excluded from basic ruleset) Builder: single-make SubPackages: @@ -42,3 +44,73 @@ Description: | OHM console plugin for debug interface. AutoDepend: no + - Name: ohm-plugin-videoep + AsWholeName: yes + Group: System/Resource Policy + Summary: Video enforcement point for OHM + Description: | + OHM videoep plugin provides policy enforcement point for | + video. + Requires: + - ohm + - ohm-plugin-signaling + - xserver-policy-enforcement + - Name: ohm-plugin-fmradio + AsWholeName: yes + Group: System/Resource Policy + Summary: FM radio enforcement point for OHM + Description: | + OHM fmradio plugin provides policy enforcement point for | + FM Radio. + Requires: + - ohm + - Name: ohm-plugin-dspep + AsWholeName: yes + Group: System/Resource Policy + Summary: DSP enforcement point for OHM + Description: | + OHM dspep plugin provides policy enforcement point for | + DSP. + Requires: + - ohm + - ohm-plugin-signaling + - Name: ohm-plugins-dbus + AsWholeName: yes + Group: System/Resource Policy + Summary: DBus plugins for OHM + Description: DBus related plugins for OHM. + Requires: + - ohm + - Name: ohm-plugin-telephony + AsWholeName: yes + Group: System/Resource Policy + Summary: Telephony plugin for OHM + Description: | + OHM telephony plugin provides policy control points for telephony. + Requires: + - ohm + - Name: ohm-plugin-signaling + AsWholeName: yes + Group: System/Resource Policy + Summary: Signaling plugin for OHM + Description: | + OHM signaling plugin provides functionality required by videoep | + and dspep. + - Name: ohm-plugin-media + AsWholeName: yes + Group: System/Resource Policy + Summary: Media playback enforcement point for OHM + Description: | + OHM media plugin provides policy enforcement point for | + media playback. + Requires: + - ohm + - Name: ohm-plugin-accessories + AsWholeName: yes + Group: System/Resource Policy + Summary: Sensor OHM plugin for device accessories + Description: | + OHM accessories plugin provides functionality to detect plugged | + in device accessories. + Requires: + - ohm
