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/5292 Thank You, rojkov [This message was auto-generated] --- Request # 5292: Messages from BOSS: State: review at 2012-07-24T15:54:54 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,4 @@ +* Tue Jul 24 2012 Dmitry Rozhkov <[email protected]> - 1.1.59 +- Disable apptrack and cgroups as the cgroups plugin seems to be + incompatible with systemd. + new: ---- disable-cgroups-plugin.patch spec files: ----------- --- ohm-plugins-misc.spec +++ ohm-plugins-misc.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.24.1 # + +Name: ohm-plugins-misc + # >> macros # << macros -Name: ohm-plugins-misc Summary: A miscallaneous set of Nokia OHM plugins Version: 1.1.59 Release: 0 @@ -14,6 +16,7 @@ URL: http://meego.gitorious.org/maemo-multimedia/ohm-plugins-misc Source0: maemo-multimedia-ohm-plugins-misc-264ebb39.tar.gz Source100: ohm-plugins-misc.yaml +Patch0: disable-cgroups-plugin.patch Requires: ohm BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11-xcb) @@ -27,11 +30,9 @@ BuildRequires: bison BuildRequires: flex - %description A miscallaneous set of OHM plugins by Nokia. - %package -n ohm-plugin-console Summary: Console OHM plugin Group: Development/Tools @@ -44,6 +45,8 @@ %prep %setup -q -n maemo-multimedia-%{name} +# disable-cgroups-plugin.patch +%patch0 -p1 # >> setup # << setup @@ -53,7 +56,6 @@ %autogen --disable-static %configure --disable-static \ - --enable-apptrack \ --enable-telephony \ --disable-videoep \ --disable-notification @@ -62,6 +64,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -77,21 +80,12 @@ # << install post - - - - - - - %files %defattr(-,root,root,-) # >> files %{_libdir}/ohm/libohm_accessories.so -%{_libdir}/ohm/libohm_apptrack.so %{_libdir}/ohm/libohm_auth.so %{_libdir}/ohm/libohm_auth_test.so -%{_libdir}/ohm/libohm_cgroups.so %{_libdir}/ohm/libohm_delay.so %{_libdir}/ohm/libohm_fmradio.so %{_libdir}/ohm/libohm_gconf.so @@ -106,13 +100,13 @@ %{_bindir}/ohm-session-agent %config %{_sysconfdir}/ohm/plugins.d/*.ini %doc README COPYING AUTHORS +#%{_libdir}/ohm/libohm_apptrack.so +#%{_libdir}/ohm/libohm_cgroups.so # << files - %files -n ohm-plugin-console %defattr(-,root,root,-) # >> files ohm-plugin-console %{_libdir}/ohm/libohm_console.so %doc COPYING AUTHORS # << files ohm-plugin-console - other changes: -------------- ++++++ disable-cgroups-plugin.patch (new) --- disable-cgroups-plugin.patch +++ disable-cgroups-plugin.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 5e48133..9cf6491 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -2,7 +2,6 @@ SUBDIRS = \ + signaling \ + console \ + gconf \ +- cgroups \ + delay \ + upstart \ + auth \ ++++++ ohm-plugins-misc.yaml --- ohm-plugins-misc.yaml +++ ohm-plugins-misc.yaml @@ -9,6 +9,9 @@ - maemo-multimedia-ohm-plugins-misc-264ebb39.tar.gz Description: A miscallaneous set of OHM plugins by Nokia. +Patches: + - disable-cgroups-plugin.patch + Requires: - ohm PkgBR: @@ -26,7 +29,6 @@ - libdres Configure: autogen ConfigOptions: - - --enable-apptrack - --enable-telephony - --disable-videoep - --disable-notification # for now (excluded from basic ruleset) @@ -38,4 +40,4 @@ Summary: Console OHM plugin Description: | OHM console plugin for debug interface. - AutoDepend: no \ No newline at end of file + AutoDepend: no
