I have made the following changes intended for : CE:UX:MTF / qmsystem 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/2667 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2667: Messages from BOSS: None State: new 2011-10-24T18:05:27 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_UX_MTF_armv7hl found. accepted on No date Changes: submit: Project:MTF / qmsystem -> CE:UX:MTF / qmsystem Index: qmsystem.changes =================================================================== --- qmsystem.changes (revision 0) +++ qmsystem.changes (revision 2) @@ -0,0 +1,35 @@ +* Fri Sep 30 2011 Marko Saukko <[email protected]> - 1.4.1 +- Removed documentation. + +* Fri Sep 16 2011 Marko Saukko <[email protected]> - 1.4.1 +- Updated to version 1.4.1 + +* Sun May 24 2011 Philippe De Swert <[email protected]> - 1.1.6 +- Add qmusbmode patch to work around gconf issue and make usb config applet to work + +* Tue May 24 2011 Miroslav Safr <[email protected]> - 1.1.6 +- BMC#18064 - Remove qmsystem dependency on mce because it is not available anymore +-- removed mce dependecy (added disable_mce_dependency.patch) +-- created .yaml file and regenerated .spec file + +* Fri Apr 08 2011 Miroslav Safr <[email protected]> - 1.1.6 +- BMC#15199 - Update meegotouch framework +- update to 1.1.6 - required by meegotouch-systemui + +* Thu Feb 10 2011 Tapio Rantala <[email protected]> - 1.0.10-1 +- New upstream version (BMC#12784) +- Drop displaystate-default patch, applied upstream + +* Fri Feb 04 2011 Tapio Rantala <[email protected]> - 1.0.8-1 +- New upstream version (BMC#12784) +- Add displaystate-default patch, don't report display off if mce is unavailable + +* Tue Feb 01 2011 Tapio Rantala <[email protected]> - 1.0.7-1 +- New upstream version (BMC#12784) +- Enable mce support + +* Fri Jan 21 2011 Tapio Rantala <[email protected]> - 1.0.6_1-1 +- New upstream version (BMC#12784) + +* Mon Dec 20 2010 Tapio Rantala <[email protected]> - 1.0.0-1 +- Initial meego packaging (FEA#11097) Index: qmsystem-1.4.1-meego-1.3-compile-fix.patch =================================================================== --- qmsystem-1.4.1-meego-1.3-compile-fix.patch (revision 0) +++ qmsystem-1.4.1-meego-1.3-compile-fix.patch (revision 2) @@ -0,0 +1,23 @@ +diff --exclude='*~' -ruN qmsystem-1.4.1.orig/system/msystemdbus_p.h qmsystem-1.4.1/system/msystemdbus_p.h +--- qmsystem-1.4.1.orig/system/msystemdbus_p.h 2011-09-16 14:45:24.803679354 +0300 ++++ qmsystem-1.4.1/system/msystemdbus_p.h 2011-09-16 15:16:02.712532219 +0300 +@@ -91,6 +91,7 @@ + #define MODE_CHARGING "charging_only" + #define MODE_UNDEFINED "undefined" + #define MODE_ASK "ask" ++ #define MODE_WINDOWS_NET "windows_network" + #endif /* HAVE_USB_MODED_DEV */ + + #endif // MSYSTEMDBUS_P_H +diff --exclude='*~' -ruN qmsystem-1.4.1.orig/system/system.pro qmsystem-1.4.1/system/system.pro +--- qmsystem-1.4.1.orig/system/system.pro 2011-09-16 14:45:24.804679375 +0300 ++++ qmsystem-1.4.1/system/system.pro 2011-09-16 15:29:42.179341296 +0300 +@@ -5,7 +5,7 @@ + DEFINES += SYSTEM_LIBRARY + QT = core network dbus + +-QMAKE_CXXFLAGS += -Wall -Werror -Wno-psabi ++QMAKE_CXXFLAGS += -Wall -Wno-psabi + + CONFIG += link_pkgconfig + PKGCONFIG += dsme dsme_dbus_if gconf-2.0 libiphb sensord timed Index: disable_mce_dependency.patch =================================================================== --- disable_mce_dependency.patch (revision 0) +++ disable_mce_dependency.patch (revision 2) @@ -0,0 +1,15 @@ +diff --git a/system/system.pro b/system/system.pro +index 45a3dae..6b64813 100644 +--- a/system/system.pro ++++ b/system/system.pro +@@ -10,8 +10,8 @@ QMAKE_CXXFLAGS += -Wall -Wno-psabi + CONFIG += link_pkgconfig + PKGCONFIG += dsme dsme_dbus_if gconf-2.0 libiphb sensord timed + +-message("Compiling with mce support") +-DEFINES += HAVE_MCE ++#message("Compiling with mce support") ++#DEFINES += HAVE_MCE + + linux-g++-maemo { + message("Compiling with usb-moded-dev support") Index: qmsystem-set-default-usbmode-with-dbus.diff =================================================================== --- qmsystem-set-default-usbmode-with-dbus.diff (revision 0) +++ qmsystem-set-default-usbmode-with-dbus.diff (revision 2) @@ -0,0 +1,29 @@ +diff --git a/system/qmusbmode.cpp b/system/qmusbmode.cpp +index 8413bbf..1fa3341 100644 +--- a/system/qmusbmode.cpp ++++ b/system/qmusbmode.cpp +@@ -172,6 +172,13 @@ + if (str.isEmpty()) { + return false; + } ++ ++ // Meego uses different gconf databases for root and user, so sending dbus message to set it ++ QDBusMessage usbDefaultModeSetCall = QDBusMessage::createMethodCall(USB_MODE_SERVICE, USB_MODE_OBJECT, USB_MODE_INTERFACE, USB_MODE_CONFIG_SET); ++ usbDefaultModeSetCall << str; ++ ++ (void)QDBusConnection::systemBus().call(usbDefaultModeSetCall, QDBus::NoBlock); ++ + gboolean ret = gconf_client_set_string(priv->gcClient, USB_MODE_GCONF, str.toAscii().data(), NULL); + if (ret == TRUE) { + return true; +--- a/system/msystemdbus_p.h ++++ b/system/msystemdbus_p.h +@@ -79,6 +79,7 @@ + + #define USB_MODE_STATE_REQUEST "mode_request" + #define USB_MODE_STATE_SET "set_mode" ++ #define USB_MODE_CONFIG_SET "set_config" + + #define USB_CONNECTED "USB connected" + #define USB_DISCONNECTED "USB disconnected" + Index: qmsystem-1.0.0-tests-directories.patch =================================================================== --- qmsystem-1.0.0-tests-directories.patch (revision 0) +++ qmsystem-1.0.0-tests-directories.patch (revision 2) @@ -0,0 +1,27 @@ +diff --git a/tests/tests.pro b/tests/tests.pro +index c982a59..9df1464 100644 +--- a/tests/tests.pro ++++ b/tests/tests.pro +@@ -46,7 +46,7 @@ linux-g++-maemo { + } + + # Test definition installation +-testdefinition.files = tests.xml session +-testdefinition.path = /usr/share/qmsystem2-api-fast-tests ++testdefinition.files = tests.xml ++testdefinition.path = /usr/share/qmsystem-tests + + INSTALLS += testdefinition +diff --git a/tests/tests.xml b/tests/tests.xml +index d85c7ed..5095676 100644 +--- a/tests/tests.xml ++++ b/tests/tests.xml +@@ -1,7 +1,7 @@ + <?xml version="1.0" encoding="ISO-8859-1"?> + <testdefinition version="0.1"> + <!-- Test suite, name mandatory - the same as test package name --> +- <suite name="libqmsystem2-tests" domain="System Software"> ++ <suite name="qmsystem-tests" domain="System Software"> + <!-- At least one set per suite, name and description mandatory --> + + <set name="Qt-API-subsystem-classes" description="Unit test cases for SystemSW APIs" feature="SystemSW Qt API"> Index: qmsystem.spec =================================================================== --- qmsystem.spec (revision 0) +++ qmsystem.spec (revision 2) @@ -0,0 +1,137 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +# << macros + +Name: qmsystem +Summary: QmSystem library +Version: 1.4.1 +Release: 1 +Group: System/System Control +License: LGPLv2 +URL: http://meego.gitorious.org/meego-middleware/qmsystem +Source0: %{name}-%{version}.tar.bz2 +Source100: qmsystem.yaml +Patch0: %{name}-1.0.0-tests-directories.patch +Patch1: disable_mce_dependency.patch +Patch2: qmsystem-set-default-usbmode-with-dbus.diff +Patch3: qmsystem-1.4.1-meego-1.3-compile-fix.patch +Patch4: qmsystem-1.4.1-no-docs.patch +Requires: sensorfw >= 0.6.33 +Requires: timed >= 2.31 +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dsme) +BuildRequires: pkgconfig(dsme_dbus_if) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(libiphb) >= 0.61.29 +BuildRequires: pkgconfig(QtCore) >= 4.5 +BuildRequires: pkgconfig(sensord) >= 0.6.33 +BuildRequires: pkgconfig(timed) >= 2.31 +BuildRequires: fdupes + + +%description +This package contains the QmSystem library. + + +%package tests +Summary: Unit test cases and xml test description for libqmsystem2 library +Group: Development/System +Requires: %{name} = %{version}-%{release} +Requires: testrunner-lite + +%description tests +%{summary}. + +%package devel +Summary: Development headers for QmSystem library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers for compiling applications against the QmSystem library. + + +%prep +%setup -q -n %{name}-%{version} + +# %{name}-1.0.0-tests-directories.patch +%patch0 -p1 +# disable_mce_dependency.patch +%patch1 -p1 +# qmsystem-set-default-usbmode-with-dbus.diff +%patch2 -p1 +# qmsystem-1.4.1-meego-1.3-compile-fix.patch +%patch3 -p1 +# qmsystem-1.4.1-no-docs.patch +%patch4 -p1 +# >> setup +# << setup + +%build +# >> build pre +%qmake +make +# << build pre + + + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre + +# >> install post +%make_install +%fdupes %{buildroot}/%{_docdir}/qmsystem2/html/ +# << install post + + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + + + + + + + +%files +%defattr(-,root,root,-) +# >> files +%doc debian/copyright +%{_libdir}/libqmsystem2.so.* +%{_sbindir}/qmkeyd2 +# From doc +# %doc debian/changelog debian/copyright +# %{_docdir}/qmsystem2/html/* +# << files + + +%files tests +%defattr(-,root,root,-) +# >> files tests +%doc debian/copyright +%{_bindir}/*-test +%{_datadir}/%{name}-tests/tests.xml +# << files tests + +%files devel +%defattr(-,root,root,-) +# >> files devel +%doc debian/copyright +%{_includedir}/qmsystem2/*.h +%{_libdir}/libqmsystem2.so +%{_libdir}/pkgconfig/qmsystem2.pc +%{_datadir}/qt4/mkspecs/features/qmsystem2.prf +# << files devel + Index: qmsystem-1.4.1-no-docs.patch =================================================================== --- qmsystem-1.4.1-no-docs.patch (revision 0) +++ qmsystem-1.4.1-no-docs.patch (revision 2) @@ -0,0 +1,12 @@ +diff -ruN --exclude='*~' qmsystem-1.4.1.orig/libqmsystem2.pro qmsystem-1.4.1/libqmsystem2.pro +--- qmsystem-1.4.1.orig/libqmsystem2.pro 2011-09-30 14:57:54.568005531 +0300 ++++ qmsystem-1.4.1/libqmsystem2.pro 2011-09-30 14:58:34.101700632 +0300 +@@ -1,8 +1,6 @@ + TEMPLATE = subdirs + SUBDIRS = system keyd tests + +-include( doc/doc.pri ) +- + PKGCONFIGFILES.files = qmsystem2.pc + PKGCONFIGFILES.path = /usr/lib/pkgconfig + Index: qmsystem.yaml =================================================================== --- qmsystem.yaml (revision 0) +++ qmsystem.yaml (revision 2) @@ -0,0 +1,51 @@ +Name: qmsystem +Summary: QmSystem library +Version: 1.4.1 +Release: 1 +Group: System/System Control +License: LGPLv2 +URL: http://meego.gitorious.org/meego-middleware/qmsystem +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - "%{name}-1.0.0-tests-directories.patch" + - disable_mce_dependency.patch + - qmsystem-set-default-usbmode-with-dbus.diff + - qmsystem-1.4.1-meego-1.3-compile-fix.patch + - qmsystem-1.4.1-no-docs.patch +Description: This package contains the QmSystem library. + +Requires: + - sensorfw >= 0.6.33 + - timed >= 2.31 +PkgBR: + - fdupes +PkgConfigBR: + - dbus-1 + - dsme + - dsme_dbus_if + - gconf-2.0 + - libiphb >= 0.61.29 + - QtCore >= 4.5 + - sensord >= 0.6.33 + - timed >= 2.31 +Configure: none +Builder: none +SubPackages: +# - Name: doc +# Summary: API documentation for libqmsystem2 +# Group: Documentation +# Description: Doxygen-generated API documentation for QmSystem library. + + - Name: tests + Summary: Unit test cases and xml test description for libqmsystem2 library + Group: Development/System + Description: "%{summary}." + Requires: + - testrunner-lite + + - Name: devel + Summary: Development headers for QmSystem library + Group: Development/Libraries + Description: Development headers for compiling applications against the QmSystem library. + Index: qmsystem-1.4.1.tar.bz2 =================================================================== Binary file qmsystem-1.4.1.tar.bz2 added
