I have made the following changes intended for : CE:Adaptation:N900 / contextkit-maemo-battery-rx51-bin
Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below https://build.pub.meego.com/request/show/2639 Thank You, - ([email protected]) [This message was auto-generated] --- Request # 2639: Messages from BOSS: None State: new 2011-10-24T15:57:33 lbt Reviews: None Changes: submit: home:stskeeps:mer:hw:n900 / contextkit-maemo-battery-rx51-bin -> CE:Adaptation:N900 / contextkit-maemo-battery-rx51-bin Index: includepath-fix.patch =================================================================== --- includepath-fix.patch (revision 0) +++ includepath-fix.patch (revision 2) @@ -0,0 +1,29 @@ +diff --git a/libcontextsubscriber-plugins/battery/Makefile.am b/libcontextsubscriber-plugins/battery/Makefile.am +index d482b46..57b1033 100644 +--- a/libcontextsubscriber-plugins/battery/Makefile.am ++++ b/libcontextsubscriber-plugins/battery/Makefile.am +@@ -12,15 +12,15 @@ libbattery_rx51_la_SOURCES = batteryplugin.cpp \ + AM_CXXFLAGS = -I$(top_srcdir)/common $(QtCore_CFLAGS) \ + $(CTXTSUBS_CFLAGS) \ + '-DCONTEXT_LOG_MODULE_NAME="batteryplugin"' \ +- -I/usr/include \ +- -I/usr/include/hw \ +- -I/usr/include/nos \ +- -I/usr/include/adc \ +- -I/usr/include/em \ +- -I/usr/include/em/bb5 \ +- -I/usr/include/em/hal \ +- -I/usr/include/RX-51 \ +- -I/usr/include/osso ++ -I/usr/include/bme \ ++ -I/usr/include/bme/hw \ ++ -I/usr/include/bme/nos \ ++ -I/usr/include/bme/adc \ ++ -I/usr/include/bme/em \ ++ -I/usr/include/bme/em/bb5 \ ++ -I/usr/include/bme/em/hal \ ++ -I/usr/include/bme/RX-51 \ ++ -I/usr/include/bme/osso + + # module: Libtool shouldn't complain about not having "lib" prefix + # avoid-version: Don't add version numbers after .so Index: contextkit-maemo-battery-rx51-0.7.14.tar.bz2 =================================================================== Binary file contextkit-maemo-battery-rx51-0.7.14.tar.bz2 added Index: contextkit-maemo-battery-rx51-bin.yaml =================================================================== --- contextkit-maemo-battery-rx51-bin.yaml (revision 0) +++ contextkit-maemo-battery-rx51-bin.yaml (revision 2) @@ -0,0 +1,21 @@ +Name: contextkit-maemo-battery-rx51-bin +Summary: ContextKit BatteryPlugin for MeeGo N900 +Version: 0.7.14 +Release: 0 +Group: System/Context Framework +License: GPLv2 +Sources: + - "%{name}-%{version}-%{_target_cpu}.tar.bz2" + - "contextkit-maemo-battery-rx51-%{version}.tar.bz2" + - "includepath-fix.patch" +Description: | + This is a ContextKit battery-plugin for the Nokia N900. A library for + reading battery data and providing it to the application layer. + This package only contains the binaries. +ExclusiveArch: "%arm" +Requires: + - "bme-rx-51" + +SetupOptions: -q -n %{name}-%{version}-%{_target_cpu} +Configure: none +Builder: none Index: contextkit-maemo-battery-rx51-bin-0.7.14-armv7l.tar.bz2 =================================================================== Binary file contextkit-maemo-battery-rx51-bin-0.7.14-armv7l.tar.bz2 added Index: contextkit-maemo-battery-rx51-bin-0.7.14-armv7hl.tar.bz2 =================================================================== Binary file contextkit-maemo-battery-rx51-bin-0.7.14-armv7hl.tar.bz2 added Index: contextkit-maemo-battery-rx51-bin.spec =================================================================== --- contextkit-maemo-battery-rx51-bin.spec (revision 0) +++ contextkit-maemo-battery-rx51-bin.spec (revision 2) @@ -0,0 +1,67 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +%define debug_package %{nil} +# << macros + +Name: contextkit-maemo-battery-rx51-bin +Summary: ContextKit BatteryPlugin for MeeGo N900 +Version: 0.7.14 +Release: 0 +Group: System/Context Framework +License: GPLv2 +ExclusiveArch: %arm +Source0: %{name}-%{version}-%{_target_cpu}.tar.bz2 +Source1: contextkit-maemo-battery-rx51-%{version}.tar.bz2 +Source2: includepath-fix.patch +Source100: contextkit-maemo-battery-rx51-bin.yaml +Requires: bme-rx-51 + + +%description +This is a ContextKit battery-plugin for the Nokia N900. A library for +reading battery data and providing it to the application layer. +This package only contains the binaries. + + + + +%prep +%setup -q -n %{name}-%{version}-%{_target_cpu} + +# >> setup +# << setup + +%build +# >> build pre +# << build pre + + + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre + +# >> install post +install -d $RPM_BUILD_ROOT +cp -ax ./* $RPM_BUILD_ROOT +# << install post + + + + + + +%files +%defattr(-,root,root,-) +# >> files +%{_libdir}/contextkit/subscriber-plugins/libbattery-rx51.so +%{_datadir}/contextkit/providers/battery.context +# << files + + Index: contextkit-maemo-battery-rx51-bin.changes =================================================================== --- contextkit-maemo-battery-rx51-bin.changes (revision 0) +++ contextkit-maemo-battery-rx51-bin.changes (revision 2) @@ -0,0 +1,7 @@ +* Mon Mar 14 2011 Markus Lehtonen <[email protected]> - 0.7.14 +- Fix for socket connection sequence between the battery plugin and bme (BMC#7170). + +* Mon Feb 28 2011 Markus Lehtonen <[email protected]> - 0.7.14 +- Initial packaging ContextKit battery plugin for N900. Plugin communicates + with the battery management daemon, i.e. BME-RX-51. +- Required to fix BMC#7170
