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/4375 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4375: Messages from BOSS: State: review at 2012-02-16T13:50:37 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,10 @@ +* Thu Feb 16 2012 Marko Saukko <[email protected]> - 0.21.13-1 +- Updated to 0.21.13-1 +- Build with libcontentaction to fix links in about applet, part of the fix for NEMO#114 +- Also build with libresourceqt1. +- Dropped non applied patches wallpaper02016_backport.diff, fix_themeapplet_stylename.diff, + and fix_tests_path.diff +- Dropped upstreamed patch: + - meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch +- Disabled display module as it depends on NEMO#35, also dropped no_mce.patch. + old: ---- fix_tests_path.diff fix_themeapplet_stylename.diff meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch meegotouch-controlpanelapplets-0.21.5.tar.bz2 no_mce.patch wallpaper02016_backport.diff new: ---- meegotouch-meegotouch-controlpanelapplets-0.21.13-1.tar.gz spec files: ----------- --- meegotouch-controlpanelapplets.spec +++ meegotouch-controlpanelapplets.spec @@ -8,20 +8,20 @@ Name: meegotouch-controlpanelapplets Summary: Various MeeGo Touch Controlpanel Applets -Version: 0.21.5 +Version: 0.21.13 Release: 1 Group: System/GUI/Other License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanelapplets -Source0: %{name}-%{version}.tar.bz2 +Source0: meegotouch-%{name}-%{version}-1.tar.gz Source100: meegotouch-controlpanelapplets.yaml -Patch0: meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch -Patch1: meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch -Patch2: no_mce.patch -Patch3: add_ce_sounds_dir.patch -Patch4: meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch +Patch0: meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch +Patch1: add_ce_sounds_dir.patch +Patch2: meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(libresourceqt1) +BuildRequires: pkgconfig(contentaction-0.1) BuildRequires: pkgconfig(quill) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(dbus-1) @@ -32,6 +32,7 @@ BuildRequires: pkgconfig(meegotouch) >= 0.20.37 BuildRequires: pkgconfig(ofono-qt) BuildRequires: pkgconfig(qmsystem2) +BuildRequires: pkgconfig(mce) BuildRequires: libthumbnailer-devel BuildRequires: meegotouch-systemui-devel BuildRequires: profiled-devel @@ -177,18 +178,14 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n meegotouch-%{name} -# meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch -%patch0 -p1 # meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch -%patch1 -p1 -# no_mce.patch -%patch2 -p1 +%patch0 -p1 # add_ce_sounds_dir.patch -%patch3 -p1 +%patch1 -p1 # meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch -%patch4 -p1 +%patch2 -p1 # >> setup # << setup @@ -197,7 +194,7 @@ # << build pre %qmake \ - BUILD_APPLET="about theme libmeegocontrol battery display gprs offline reset sound testapplet usb wallpaper2 warranty" + BUILD_APPLET="about theme libmeegocontrol battery gprs offline reset sound testapplet usb wallpaper2 warranty" make %{?jobs:-j%jobs} @@ -283,6 +280,7 @@ %{_datadir}/themes/base/meegotouch/libwallpaperapplet2/style/libwallpaperapplet2.css %{_libdir}/duicontrolpanel/wallpaper2.desktop %{_datadir}/l10n/meegotouch/wallpaperapplet2.qm +%{_bindir}/wallpaper_duplicate_finder.sh # >> files meegotouchcp-wallpaper # << files meegotouchcp-wallpaper @@ -340,11 +338,6 @@ %files -n meegotouchcp-display %defattr(-,root,root,-) -%{_libdir}/duicontrolpanel/applets/libdisplayapplet.so -%{_libdir}/duicontrolpanel/display.desktop -%{_libdir}/duicontrolpanel/brightness.desktop -%{_datadir}/themes/base/meegotouch/libdisplayapplet/style/libdisplayapplet.css -%{_datadir}/l10n/meegotouch/displayapplet.qm # >> files meegotouchcp-display # << files meegotouchcp-display other changes: -------------- ++++++ meegotouch-controlpanelapplets.yaml --- meegotouch-controlpanelapplets.yaml +++ meegotouch-controlpanelapplets.yaml @@ -1,21 +1,16 @@ Name: meegotouch-controlpanelapplets Summary: Various MeeGo Touch Controlpanel Applets -Version: 0.21.5 +Version: 0.21.13 Release: 1 Group: System/GUI/Other License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanelapplets Sources: - - "%{name}-%{version}.tar.bz2" + - "meegotouch-%{name}-%{version}-1.tar.gz" Patches: - - meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch - meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch - - no_mce.patch - add_ce_sounds_dir.patch - meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch -# - fix_tests_path.diff -# - fix_desktop_path.diff -# - fix_themeapplet_stylename.diff Description: | Various Controlpanel applets for MeeGo Touch environment: - Offline switcher @@ -29,11 +24,13 @@ - Warranty applet - Profiles switcher PkgBR: -# - doxygen - libthumbnailer-devel - meegotouch-systemui-devel - profiled-devel PkgConfigBR: + - libresourceqt1 + # For about applet. + - contentaction-0.1 - quill - gstreamer-0.10 - dbus-1 @@ -42,15 +39,15 @@ - clean-device >= 0.0.3 - meegotouch-controlpanel - meegotouch >= 0.20.37 -# - qttracker - ofono-qt - qmsystem2 + - mce Configure: none Builder: qmake QMakeOptions: - - BUILD_APPLET="about theme libmeegocontrol battery display gprs offline reset sound testapplet usb wallpaper2 warranty" -#NoFiles: True -SetupOptions: -q -n %{name}-%{version} + # Display applet disabled as it requires newer mce version: display + # See: https://bugs.nemomobile.org/show_bug.cgi?id=35 + - BUILD_APPLET="about theme libmeegocontrol battery gprs offline reset sound testapplet usb wallpaper2 warranty" Files: - "%{_sysconfdir}/meego-rfs-scripts/mcpapplets-rfs.sh" - "%{_libdir}/libmeegocontrol.so.0" @@ -107,6 +104,7 @@ - "%{_datadir}/themes/base/meegotouch/libwallpaperapplet2/style/libwallpaperapplet2.css" - "%{_libdir}/duicontrolpanel/wallpaper2.desktop" - "%{_datadir}/l10n/meegotouch/wallpaperapplet2.qm" + - "%{_bindir}/wallpaper_duplicate_finder.sh" - Name: meegotouchcp-about AsWholeName: True @@ -194,12 +192,13 @@ Requires: - meegotouch-controlpanel Description: This package contains MeegoTouch Controlpanel display settings - Files: - - "%{_libdir}/duicontrolpanel/applets/libdisplayapplet.so" - - "%{_libdir}/duicontrolpanel/display.desktop" - - "%{_libdir}/duicontrolpanel/brightness.desktop" - - "%{_datadir}/themes/base/meegotouch/libdisplayapplet/style/libdisplayapplet.css" - - "%{_datadir}/l10n/meegotouch/displayapplet.qm" +# TODO EMPTY package to maintain compatibility. +# Files: +# - "%{_libdir}/duicontrolpanel/applets/libdisplayapplet.so" +# - "%{_libdir}/duicontrolpanel/display.desktop" +# - "%{_libdir}/duicontrolpanel/brightness.desktop" +# - "%{_datadir}/themes/base/meegotouch/libdisplayapplet/style/libdisplayapplet.css" +# - "%{_datadir}/l10n/meegotouch/displayapplet.qm" - Name: meegotouchcp-reset AsWholeName: True ++++++ meegotouch-meegotouch-controlpanelapplets-0.21.13-1.tar.gz (new) ++++++ deleted files: --- fix_tests_path.diff --- fix_themeapplet_stylename.diff --- meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch --- meegotouch-controlpanelapplets-0.21.5.tar.bz2 --- no_mce.patch --- wallpaper02016_backport.diff
