I have made the following changes intended for : CE:UX:MTF / meegotouch-controlpanelapplets
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/6921 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6921: Messages from BOSS: State: review at 2012-10-04T18:13:43 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: Project:MTF:UX / meegotouch-controlpanelapplets -> CE:UX:MTF / meegotouch-controlpanelapplets changes files: -------------- --- meegotouch-controlpanelapplets.changes +++ meegotouch-controlpanelapplets.changes @@ -0,0 +1,5 @@ +* Thu Oct 04 2012 Denis Zalevskiy <[email protected]> - 0.21.14-1 +- Migrated to github, Nemo Mobile changes are added +- battery applet is removed (see nemo qml applets/power) +- workaround: gcc Note/warning removed (no-psabi) + old: ---- 0001-Fix-tests-build.patch 0002-Fix-landscape-button-layout-in-usbapplet.patch 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch 0005-Control-panel-with-charging-only-option-and-visual-f.patch 0006-Switch-mode-immediately-when-we-are-connected.patch add_ce_sounds_dir.patch meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch meegotouch-meegotouch-controlpanelapplets-0.21.13-1.tar.gz new: ---- meegotouch-controlpanelapplets-0.21.14.tar.bz2 spec files: ----------- --- meegotouch-controlpanelapplets.spec +++ meegotouch-controlpanelapplets.spec @@ -10,20 +10,13 @@ # << macros Summary: Various MeeGo Touch Controlpanel Applets -Version: 0.21.13 +Version: 0.21.14 Release: 1 Group: System/GUI/Other License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanelapplets -Source0: meegotouch-%{name}-%{version}-1.tar.gz +URL: https://github.com/nemomobile/meegotouch-controlpanelapplets +Source0: %{name}-%{version}.tar.bz2 Source100: meegotouch-controlpanelapplets.yaml -Patch0: add_ce_sounds_dir.patch -Patch1: meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch -Patch2: 0001-Fix-tests-build.patch -Patch3: 0002-Fix-landscape-button-layout-in-usbapplet.patch -Patch4: 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch -Patch5: 0005-Control-panel-with-charging-only-option-and-visual-f.patch -Patch6: 0006-Switch-mode-immediately-when-we-are-connected.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(libresourceqt1) @@ -47,7 +40,6 @@ Various Controlpanel applets for MeeGo Touch environment: - Offline switcher - USB settings - - Battery info/settings - Display settings - Profiles settings - Theme-switcher @@ -112,15 +104,6 @@ %description -n meegotouchcp-usb This package contains MeegoTouch Controlpanel USB settings -%package -n meegotouchcp-battery -Summary: MeegoTouch Controlpanel battery info/settings -Group: System/GUI/Other -Requires: %{name} = %{version}-%{release} -Requires: meegotouch-controlpanel - -%description -n meegotouchcp-battery -This package contains MeegoTouch Controlpanel battery info/settings - %package -n meegotouchcp-warranty Summary: MeegoTouch Controlpanel warranty applet Group: System/GUI/Other @@ -188,22 +171,8 @@ %prep -%setup -q -n meegotouch-%{name} +%setup -q -n %{name}-%{version} -# add_ce_sounds_dir.patch -%patch0 -p1 -# meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch -%patch1 -p1 -# 0001-Fix-tests-build.patch -%patch2 -p1 -# 0002-Fix-landscape-button-layout-in-usbapplet.patch -%patch3 -p1 -# 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch -%patch4 -p1 -# 0005-Control-panel-with-charging-only-option-and-visual-f.patch -%patch5 -p1 -# 0006-Switch-mode-immediately-when-we-are-connected.patch -%patch6 -p1 # >> setup # << setup @@ -212,7 +181,7 @@ # << build pre %qmake \ - BUILD_APPLET="about theme display libmeegocontrol battery gprs offline reset sound testapplet usb wallpaper2 warranty" + BUILD_APPLET="about theme display libmeegocontrol gprs offline reset sound testapplet usb wallpaper2 warranty" make %{?jobs:-j%jobs} @@ -296,15 +265,6 @@ # >> files meegotouchcp-usb # << files meegotouchcp-usb -%files -n meegotouchcp-battery -%defattr(-,root,root,-) -%{_libdir}/duicontrolpanel/applets/libbatteryapplet.so -%{_libdir}/duicontrolpanel/battery.desktop -%{_datadir}/themes/base/meegotouch/libbatteryapplet/style/libbatteryapplet.css -%{_datadir}/l10n/meegotouch/batteryapplet.qm -# >> files meegotouchcp-battery -# << files meegotouchcp-battery - %files -n meegotouchcp-warranty %defattr(-,root,root,-) %{_libdir}/duicontrolpanel/applets/libwarrantyapplet.so other changes: -------------- ++++++ meegotouch-controlpanelapplets-0.21.14.tar.bz2 (new) ++++++ meegotouch-controlpanelapplets.yaml --- meegotouch-controlpanelapplets.yaml +++ meegotouch-controlpanelapplets.yaml @@ -1,25 +1,16 @@ Name: meegotouch-controlpanelapplets Summary: Various MeeGo Touch Controlpanel Applets -Version: 0.21.13 +Version: 0.21.14 Release: 1 Group: System/GUI/Other License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanelapplets +URL: https://github.com/nemomobile/meegotouch-controlpanelapplets Sources: - - "meegotouch-%{name}-%{version}-1.tar.gz" -Patches: - - add_ce_sounds_dir.patch - - meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch - - 0001-Fix-tests-build.patch - - 0002-Fix-landscape-button-layout-in-usbapplet.patch - - 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch - - 0005-Control-panel-with-charging-only-option-and-visual-f.patch - - 0006-Switch-mode-immediately-when-we-are-connected.patch + - "%{name}-%{version}.tar.bz2" Description: | Various Controlpanel applets for MeeGo Touch environment: - Offline switcher - USB settings - - Battery info/settings - Display settings - Profiles settings - Theme-switcher @@ -49,7 +40,7 @@ Configure: none Builder: qmake QMakeOptions: - - BUILD_APPLET="about theme display libmeegocontrol battery gprs offline reset sound testapplet usb wallpaper2 warranty" + - BUILD_APPLET="about theme display libmeegocontrol gprs offline reset sound testapplet usb wallpaper2 warranty" Files: - "%{_sysconfdir}/meego-rfs-scripts/mcpapplets-rfs.sh" - "%{_libdir}/libmeegocontrol.so.0" @@ -147,19 +138,6 @@ - "%{_libdir}/duicontrolpanel/usbapplet.desktop" - "%{_datadir}/l10n/meegotouch/usbapplet.qm" - - Name: meegotouchcp-battery - AsWholeName: True - Summary: MeegoTouch Controlpanel battery info/settings - Group: System/GUI/Other - Requires: - - meegotouch-controlpanel - Description: This package contains MeegoTouch Controlpanel battery info/settings - Files: - - "%{_libdir}/duicontrolpanel/applets/libbatteryapplet.so" - - "%{_libdir}/duicontrolpanel/battery.desktop" - - "%{_datadir}/themes/base/meegotouch/libbatteryapplet/style/libbatteryapplet.css" - - "%{_datadir}/l10n/meegotouch/batteryapplet.qm" - - Name: meegotouchcp-warranty AsWholeName: True Summary: MeegoTouch Controlpanel warranty applet ++++++ deleted files: --- 0001-Fix-tests-build.patch --- 0002-Fix-landscape-button-layout-in-usbapplet.patch --- 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch --- 0005-Control-panel-with-charging-only-option-and-visual-f.patch --- 0006-Switch-mode-immediately-when-we-are-connected.patch --- add_ce_sounds_dir.patch --- meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch --- meegotouch-meegotouch-controlpanelapplets-0.21.13-1.tar.gz
