I have made the following changes intended for : CE:MW:Shared / ohm 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/5469 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5469: Messages from BOSS: State: review at 2012-08-09T21:30: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:sage:branches:CE:MW:Shared / ohm -> CE:MW:Shared / ohm changes files: -------------- --- ohm.changes +++ ohm.changes @@ -0,0 +1,3 @@ +* Thu Aug 09 2012 Marko Saukko <[email protected]> - 1.1.14 +- Add 0001-Remove-After-syslog.target.patch to work according to systemd recommendations + new: ---- 0001-Remove-After-syslog.target.patch spec files: ----------- --- ohm.spec +++ ohm.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: ohm + # >> macros # << macros -Name: ohm Summary: Open Hardware Manager Version: 1.1.14 Release: 1 @@ -18,6 +20,7 @@ Patch0: board-and-platform-specific-conf.patch Patch1: meego-distro.patch Patch2: compiler-warn-fix.patch +Patch3: 0001-Remove-After-syslog.target.patch Requires: ohm-config Requires: boardname >= 0.4.1 Requires: systemd @@ -25,25 +28,16 @@ Requires(post): systemd Requires(postun): systemd BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(dbus-1) >= 0.70 +BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(libsimple-trace) BuildRequires: pkgconfig(boardname) - %description Open Hardware Manager. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -%description devel -Development files for %{name} - - %package config Summary: Common configuration files for %{name} Group: System/Resource Policy @@ -65,6 +59,14 @@ developing OHM plugins. +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for %{name}. + %prep %setup -q -n %{name}-%{version} @@ -75,6 +77,8 @@ %patch1 -p1 # compiler-warn-fix.patch %patch2 -p1 +# 0001-Remove-After-syslog.target.patch +%patch3 -p1 # >> setup # << setup @@ -92,6 +96,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -109,7 +114,9 @@ %preun +if [ "$1" -eq 0 ]; then systemctl stop ohmd.service +fi %post systemctl daemon-reload @@ -118,11 +125,6 @@ %postun systemctl daemon-reload - - - - - %post plugin-core -p /sbin/ldconfig %postun plugin-core -p /sbin/ldconfig @@ -135,16 +137,6 @@ /%{_lib}/systemd/system/basic.target.wants/ohmd.service # << files -%files devel -%defattr(-,root,root,-) -# >> files devel -%{_includedir}/ohm -%{_libdir}/pkgconfig/* -%{_libdir}/libohmplugin.so -%{_libdir}/libohmfact.so -# << files devel - - %files config %defattr(-,root,root,-) # >> files config @@ -161,3 +153,11 @@ %{_libdir}/libohmfact.so.* # << files plugin-core +%files devel +%defattr(-,root,root,-) +# >> files devel +%{_includedir}/ohm +%{_libdir}/pkgconfig/* +%{_libdir}/libohmplugin.so +%{_libdir}/libohmfact.so +# << files devel other changes: -------------- ++++++ 0001-Remove-After-syslog.target.patch (new) --- 0001-Remove-After-syslog.target.patch +++ 0001-Remove-After-syslog.target.patch @@ -0,0 +1,31 @@ +From 95bb4051b99fd99e80a24cf07d4261f389490a3a Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Thu, 9 Aug 2012 20:56:49 +0000 +Subject: [PATCH] Remove After=syslog.target + +"Newer systemd versions (v35+) do not support non-socket-activated +syslog daemons anymore and we do no longer recommend people to order +their units after syslog.target." + +http://www.freedesktop.org/wiki/Software/systemd/syslog + +Signed-off-by: Marko Saukko <[email protected]> +--- + initscript/MeeGo/ohmd.service | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/initscript/MeeGo/ohmd.service b/initscript/MeeGo/ohmd.service +index 2ff0b7f..7b2c219 100644 +--- a/initscript/MeeGo/ohmd.service ++++ b/initscript/MeeGo/ohmd.service +@@ -1,7 +1,6 @@ + [Unit] + Description=ohm daemon for resource policy management + After=boardname.service +-After=syslog.target + + [Service] + Type=dbus +-- +1.7.10.3 + ++++++ ohm.yaml --- ohm.yaml +++ ohm.yaml @@ -15,6 +15,7 @@ - board-and-platform-specific-conf.patch - meego-distro.patch - compiler-warn-fix.patch + - 0001-Remove-After-syslog.target.patch Requires: - ohm-config @@ -22,8 +23,8 @@ PkgConfigBR: - glib-2.0 - - dbus-1 - - dbus-glib-1 + - dbus-1 >= 0.70 + - dbus-glib-1 >= 0.70 - check - libsimple-trace - boardname
