I have made the following changes intended for : CE:UX:MTF / meegotouchcp-bluetooth CE:UX:MTF / meegotouchcp-connman
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/3246 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3246: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-11-24T11:40:35 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: Project:MTF:UX / meegotouchcp-bluetooth -> CE:UX:MTF / meegotouchcp-bluetooth changes files: -------------- --- meegotouchcp-bluetooth.changes +++ meegotouchcp-bluetooth.changes @@ -0,0 +1,3 @@ +* Thu Nov 24 2011 Marko Saukko <[email protected]> - 0.0.9 +- Changed connman-qt dep to libmeegotouchcp-connman-qt. + old: ---- Makefile new: ---- meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch spec files: ----------- --- meegotouchcp-bluetooth.spec +++ meegotouchcp-bluetooth.spec @@ -19,9 +19,10 @@ Patch3: BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch Patch4: disable_test.patch Patch5: desktop-file-changes.patch +Patch6: meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch Requires: connman BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(connman-qt) +BuildRequires: pkgconfig(libmeegotouchcp-connman-qt) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(meegotouch) @@ -73,6 +74,8 @@ %patch4 -p1 # desktop-file-changes.patch %patch5 -p1 +# meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch +%patch6 -p1 # >> setup # << setup other changes: -------------- ++++++ meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch (new) --- meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch +++ meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch @@ -0,0 +1,20 @@ +diff -ruN --exclude='*~' meegotouchcp-bluetooth-0.0.9.orig/bluetooth/src/src.pro meegotouchcp-bluetooth-0.0.9/bluetooth/src/src.pro +--- meegotouchcp-bluetooth-0.0.9.orig/bluetooth/src/src.pro 2011-11-24 12:03:27.350709803 +0200 ++++ meegotouchcp-bluetooth-0.0.9/bluetooth/src/src.pro 2011-11-24 12:13:06.198294974 +0200 +@@ -7,14 +7,14 @@ + include(obex/obex.pri) + TEMPLATE = lib + TARGET = meegobluetooth +-LIBS += -lconnman-qt ++LIBS += -lmeegotouchcp-connman-qt + QT += dbus \ + xmlpatterns \ + xml + CONFIG += meegotouch \ + link_pkgconfig \ + debug +-PKGCONFIG += libpulse libpulse-mainloop-glib ++PKGCONFIG += libpulse libpulse-mainloop-glib libmeegotouchcp-connman-qt + OTHER_FILES += McpBluetooth.conf \ + manager.xml \ + device.xml \ ++++++ meegotouchcp-bluetooth.yaml --- meegotouchcp-bluetooth.yaml +++ meegotouchcp-bluetooth.yaml @@ -13,6 +13,7 @@ - BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch - disable_test.patch - desktop-file-changes.patch + - meegotouchcp-bluetooth-0.0.9-connman-qt-renaming.patch Description: | This is a meegotouch-controlpanel plugin that allows the setup of bluetooth devices in MeeGo. @@ -20,7 +21,7 @@ - doxygen PkgConfigBR: - QtGui - - connman-qt + - libmeegotouchcp-connman-qt - libpulse - libpulse-mainloop-glib - meegotouch ++++++ deleted files: --- Makefile submit: Project:MTF:UX / meegotouchcp-connman -> CE:UX:MTF / meegotouchcp-connman changes files: -------------- --- meegotouchcp-connman.changes +++ meegotouchcp-connman.changes @@ -0,0 +1,4 @@ +* Thu Nov 24 2011 Marko Saukko <[email protected]> - 0.0.13 +- Renamed connman-qt to libmeegotouchcp-connman-qt so we don't conflict with the other connman-qt. +- Added obsoletes meegotouchcp-connman-libconnman-qt for libmeegotouchcp-connman-qt. + old: ---- Makefile new: ---- meegotouchcp-connman-0.0.13-rename-connman-qt.patch spec files: ----------- --- meegotouchcp-connman.spec +++ meegotouchcp-connman.spec @@ -29,6 +29,7 @@ Patch12: fix_passphrase_control.patch Patch13: fix_wrong_passphrase_2.patch Patch14: desktop-file-changes.patch +Patch15: meegotouchcp-connman-0.0.13-rename-connman-qt.patch Requires: connman Requires: meego-handset-cpwifi-branding BuildRequires: pkgconfig(QtGui) @@ -42,24 +43,26 @@ -%package libconnman-qt +%package -n meegotouchcp-connman-qt Summary: A library for accessing some of connman's functionality through Qt Group: System/Libraries Requires: %{name} = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +Obsoletes: meegotouchcp-connman-libconnman-qt -%description libconnman-qt +%description -n meegotouchcp-connman-qt This library is used by meegotouchcp-connman and others to work with connman. -%package libconnman-qt-devel +%package -n meegotouchcp-connman-qt-devel Summary: Development files for libconnman-qt Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: %{name}-libconnman-qt = %{version} +Requires: meegotouchcp-connman-qt = %{version} +Obsoletes: meegotouchcp-connman-libconnman-qt-devel -%description libconnman-qt-devel +%description -n meegotouchcp-connman-qt-devel This package contains the files necessary to develop applications using libconnman-qt. @@ -109,6 +112,8 @@ %patch13 -p1 # desktop-file-changes.patch %patch14 -p1 +# meegotouchcp-connman-0.0.13-rename-connman-qt.patch +%patch15 -p1 # >> setup # << setup @@ -129,6 +134,9 @@ %qmake_install # >> install post +mv %{buildroot}/%{_libdir}/pkgconfig/connman-qt.pc %{buildroot}/%{_libdir}/pkgconfig/libmeegotouchcp-connman-qt.pc +mkdir -p %{buildroot}/%{_includedir}/meegotouchcp-connman-qt/ +mv %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/meegotouchcp-connman-qt/ # << install post @@ -137,9 +145,9 @@ -%post libconnman-qt -p /sbin/ldconfig +%post -n meegotouchcp-connman-qt -p /sbin/ldconfig -%postun libconnman-qt -p /sbin/ldconfig +%postun -n meegotouchcp-connman-qt -p /sbin/ldconfig @@ -155,36 +163,36 @@ # << files -%files libconnman-qt +%files -n meegotouchcp-connman-qt %defattr(-,root,root,-) -%{_libdir}/libconnman-qt.so.* -# >> files libconnman-qt -# << files libconnman-qt +%{_libdir}/libmeegotouchcp-connman-qt.so.* +# >> files meegotouchcp-connman-qt +# << files meegotouchcp-connman-qt -%files libconnman-qt-devel +%files -n meegotouchcp-connman-qt-devel %defattr(-,root,root,-) -%{_includedir}/manager.h -%{_includedir}/service.h -%{_includedir}/networkitemmodel.h -%{_includedir}/networklistmodel.h -%{_includedir}/commondbustypes.h -%{_includedir}/technologybutton.h -%{_includedir}/offlinebutton.h -%{_libdir}/pkgconfig/connman-qt.pc -%{_libdir}/libconnman-qt.so -# >> files libconnman-qt-devel -# << files libconnman-qt-devel +%{_includedir}/meegotouchcp-connman-qt/manager.h +%{_includedir}/meegotouchcp-connman-qt/service.h +%{_includedir}/meegotouchcp-connman-qt/networkitemmodel.h +%{_includedir}/meegotouchcp-connman-qt/networklistmodel.h +%{_includedir}/meegotouchcp-connman-qt/commondbustypes.h +%{_includedir}/meegotouchcp-connman-qt/technologybutton.h +%{_includedir}/meegotouchcp-connman-qt/offlinebutton.h +%{_libdir}/pkgconfig/libmeegotouchcp-connman-qt.pc +%{_libdir}/libmeegotouchcp-connman-qt.so +# >> files meegotouchcp-connman-qt-devel +# << files meegotouchcp-connman-qt-devel %files branding-upsteam %defattr(-,root,root,-) -%{_datadir}//themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg-dn.png -%{_datadir}//themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg.png -%{_datadir}//themes/base/meegotouch/duicontrolpanel/images/device-settings-header-bg.png -%{_datadir}//themes/base/meegotouch/libwifiapplet/style/confirmremovepagestyle.css -%{_datadir}//themes/base/meegotouch/libwifiapplet/style/libwifiapplet.css -%{_datadir}//themes/base/meegotouch/libwifiapplet/style/listpagestyle.css -%{_datadir}//themes/base/meegotouch/libwifiapplet/style/networkitemstyle.css -%{_datadir}//themes/base/meegotouch/libwifiapplet/style/passwordpagestyle.css +%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg-dn.png +%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg.png +%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/device-settings-header-bg.png +%{_datadir}/themes/base/meegotouch/libwifiapplet/style/confirmremovepagestyle.css +%{_datadir}/themes/base/meegotouch/libwifiapplet/style/libwifiapplet.css +%{_datadir}/themes/base/meegotouch/libwifiapplet/style/listpagestyle.css +%{_datadir}/themes/base/meegotouch/libwifiapplet/style/networkitemstyle.css +%{_datadir}/themes/base/meegotouch/libwifiapplet/style/passwordpagestyle.css %{_datadir}/themes/base/meegotouch/libwifiapplet/libwifiapplet.conf %{_datadir}/l10n//meegotouch/libwifiapplet.qm # >> files branding-upsteam other changes: -------------- ++++++ meegotouchcp-connman-0.0.13-rename-connman-qt.patch (new) --- meegotouchcp-connman-0.0.13-rename-connman-qt.patch +++ meegotouchcp-connman-0.0.13-rename-connman-qt.patch @@ -0,0 +1,46 @@ +diff -ruN --exclude='*~' meegotouchcp-connman-0.0.13.orig/libconnman-qt/connman-qt.pc meegotouchcp-connman-0.0.13/libconnman-qt/connman-qt.pc +--- meegotouchcp-connman-0.0.13.orig/libconnman-qt/connman-qt.pc 2011-11-24 11:21:58.610298727 +0200 ++++ meegotouchcp-connman-0.0.13/libconnman-qt/connman-qt.pc 2011-11-24 12:11:16.837736387 +0200 +@@ -1,11 +1,11 @@ + prefix=/usr + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib +-includedir=${prefix}/include ++libdir=${exec_prefix}/lib/meegotouchcp-connman-qt ++includedir=${prefix}/include/meegotouchcp-connman-qt + +-Name: connman-qt +-Description: Some connman functionality exposed through Qt. Not a general purpose connman library ++Name: libmeegotouchcp-connman-qt ++Description: Some connman functionality exposed through Qt. Not a general purpose connman library + Version: 0.0.4 + Requires: QtDBus meegotouch + Cflags: -I${includedir} +-Libs: -L${libdir} -lconnman-qt +\ No newline at end of file ++Libs: -L${libdir} -lmeegotouchcp-connman-qt +\ No newline at end of file +diff -ruN --exclude='*~' meegotouchcp-connman-0.0.13.orig/libconnman-qt/libconnman-qt.pro meegotouchcp-connman-0.0.13/libconnman-qt/libconnman-qt.pro +--- meegotouchcp-connman-0.0.13.orig/libconnman-qt/libconnman-qt.pro 2011-11-24 11:21:58.608298682 +0200 ++++ meegotouchcp-connman-0.0.13/libconnman-qt/libconnman-qt.pro 2011-11-24 11:31:35.795370280 +0200 +@@ -8,7 +8,7 @@ + meegotouch \ + debug + QT += dbus +-TARGET = $$qtLibraryTarget(connman-qt) ++TARGET = $$qtLibraryTarget(meegotouchcp-connman-qt) + target.path = /usr/lib + !exists(manager.h) { + system(qdbusxml2cpp -c Manager -p manager -N connman-manager.xml) +diff -ruN --exclude='*~' meegotouchcp-connman-0.0.13.orig/libwifiapplet/libwifiapplet.pro meegotouchcp-connman-0.0.13/libwifiapplet/libwifiapplet.pro +--- meegotouchcp-connman-0.0.13.orig/libwifiapplet/libwifiapplet.pro 2011-11-24 11:21:58.617298888 +0200 ++++ meegotouchcp-connman-0.0.13/libwifiapplet/libwifiapplet.pro 2011-11-24 11:27:42.268094276 +0200 +@@ -9,7 +9,7 @@ + duicontrolpanel \ + plugin \ + debug +-LIBS += -L ../libconnman-qt -lconnman-qt ++LIBS += -L ../libconnman-qt -lmeegotouchcp-connman-qt + INCLUDEPATH += ../libconnman-qt + include(theme/theme.pri) + ++++++ meegotouchcp-connman.yaml --- meegotouchcp-connman.yaml +++ meegotouchcp-connman.yaml @@ -25,6 +25,7 @@ - fix_passphrase_control.patch - fix_wrong_passphrase_2.patch - desktop-file-changes.patch + - meegotouchcp-connman-0.0.13-rename-connman-qt.patch PkgBR: - doxygen PkgConfigBR: @@ -40,32 +41,38 @@ - "%{_libdir}/duicontrolpanel/meegotouchcp-connman.desktop" - "%{_libdir}/duicontrolpanel/applets/libwifiapplet.so" SubPackages: - - Name: libconnman-qt + - Name: meegotouchcp-connman-qt Summary: A library for accessing some of connman's functionality through Qt Group: System/Libraries + Obsoletes: + - meegotouchcp-connman-libconnman-qt + AsWholeName: true Description: | This library is used by meegotouchcp-connman and others to work with connman. Files: - - "%{_libdir}/libconnman-qt.so.*" + - "%{_libdir}/libmeegotouchcp-connman-qt.so.*" - - Name: libconnman-qt-devel + - Name: meegotouchcp-connman-qt-devel Summary: Development files for libconnman-qt Group: Development/Libraries + Obsoletes: + - meegotouchcp-connman-libconnman-qt-devel + AsWholeName: true Description: | This package contains the files necessary to develop applications using libconnman-qt. Requires: - - "%{name}-libconnman-qt = %{version}" + - "meegotouchcp-connman-qt = %{version}" Files: - - "%{_includedir}/manager.h" - - "%{_includedir}/service.h" - - "%{_includedir}/networkitemmodel.h" - - "%{_includedir}/networklistmodel.h" - - "%{_includedir}/commondbustypes.h" - - "%{_includedir}/technologybutton.h" - - "%{_includedir}/offlinebutton.h" - - "%{_libdir}/pkgconfig/connman-qt.pc" - - "%{_libdir}/libconnman-qt.so" + - "%{_includedir}/meegotouchcp-connman-qt/manager.h" + - "%{_includedir}/meegotouchcp-connman-qt/service.h" + - "%{_includedir}/meegotouchcp-connman-qt/networkitemmodel.h" + - "%{_includedir}/meegotouchcp-connman-qt/networklistmodel.h" + - "%{_includedir}/meegotouchcp-connman-qt/commondbustypes.h" + - "%{_includedir}/meegotouchcp-connman-qt/technologybutton.h" + - "%{_includedir}/meegotouchcp-connman-qt/offlinebutton.h" + - "%{_libdir}/pkgconfig/libmeegotouchcp-connman-qt.pc" + - "%{_libdir}/libmeegotouchcp-connman-qt.so" - Name: branding-upsteam Summary: MeeGo wifi controlpanel applet theme files @@ -76,13 +83,13 @@ Provides: - meego-handset-cpwifi-branding Files: - - "%{_datadir}//themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg-dn.png" - - "%{_datadir}//themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg.png" - - "%{_datadir}//themes/base/meegotouch/duicontrolpanel/images/device-settings-header-bg.png" - - "%{_datadir}//themes/base/meegotouch/libwifiapplet/style/confirmremovepagestyle.css" - - "%{_datadir}//themes/base/meegotouch/libwifiapplet/style/libwifiapplet.css" - - "%{_datadir}//themes/base/meegotouch/libwifiapplet/style/listpagestyle.css" - - "%{_datadir}//themes/base/meegotouch/libwifiapplet/style/networkitemstyle.css" - - "%{_datadir}//themes/base/meegotouch/libwifiapplet/style/passwordpagestyle.css" + - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg-dn.png" + - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/device-settings-bodytext-bg.png" + - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/device-settings-header-bg.png" + - "%{_datadir}/themes/base/meegotouch/libwifiapplet/style/confirmremovepagestyle.css" + - "%{_datadir}/themes/base/meegotouch/libwifiapplet/style/libwifiapplet.css" + - "%{_datadir}/themes/base/meegotouch/libwifiapplet/style/listpagestyle.css" + - "%{_datadir}/themes/base/meegotouch/libwifiapplet/style/networkitemstyle.css" + - "%{_datadir}/themes/base/meegotouch/libwifiapplet/style/passwordpagestyle.css" - "%{_datadir}/themes/base/meegotouch/libwifiapplet/libwifiapplet.conf" - "%{_datadir}/l10n//meegotouch/libwifiapplet.qm" ++++++ deleted files: --- Makefile
