I have made the following changes intended for : CE:UX:MTF / meegotouch-controlpanel
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/4401 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4401: Messages from BOSS: State: review at 2012-02-22T09:49:42 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-controlpanel -> CE:UX:MTF / meegotouch-controlpanel changes files: -------------- --- meegotouch-controlpanel.changes +++ meegotouch-controlpanel.changes @@ -0,0 +1,6 @@ +* Tue Feb 21 2012 Marko Saukko <[email protected]> - 0.14.7.1 +- Update to version 0.14.7.1 +- Added patches to fix categories: + - 0001-Remove-empty-variables-from-categories.patch + - 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch + old: ---- meegotouch-controlpanel-0.14.5.tar.bz2 new: ---- 0001-Remove-empty-variables-from-categories.patch 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch meegotouch-meegotouch-controlpanel-0.14.7.1.tar.gz spec files: ----------- --- meegotouch-controlpanel.spec +++ meegotouch-controlpanel.spec @@ -7,15 +7,17 @@ Name: meegotouch-controlpanel Summary: MeeGo Control Panel -Version: 0.14.5 +Version: 0.14.7.1 Release: 1 Group: Application Framework/MeeGo Touch Settings License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanel[meego] -Source0: %{name}-%{version}.tar.bz2 +URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanel/ +Source0: meegotouch-%{name}-%{version}.tar.gz Source100: meegotouch-controlpanel.yaml Patch0: exchange_desktop.patch Patch1: meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch +Patch2: 0001-Remove-empty-variables-from-categories.patch +Patch3: 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch Requires: meegotouch-controlpanel-l10n-engineering-english Requires: libmeegocontrolpanel BuildRequires: pkgconfig(QtGui) @@ -90,12 +92,16 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n meegotouch-%{name} # exchange_desktop.patch %patch0 -p1 # meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch %patch1 -p1 +# 0001-Remove-empty-variables-from-categories.patch +%patch2 -p1 +# 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch +%patch3 -p1 # >> setup # << setup @@ -118,6 +124,8 @@ # >> install post # This is here because of file /usr/share/doc/libduicontrolpanel/html/.directory rm -rf %{buildroot}/usr/share/doc/ +# We should not ship examples +rm -rf %{buildroot}/usr/share/duicontrolpanel/categories/examples # << install post desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ other changes: -------------- ++++++ 0001-Remove-empty-variables-from-categories.patch (new) --- 0001-Remove-empty-variables-from-categories.patch +++ 0001-Remove-empty-variables-from-categories.patch @@ -0,0 +1,195 @@ +From 3e8e8dd1da0ccdb2a0ef2ebde426fd18317b07f0 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Tue, 21 Feb 2012 17:16:25 +0200 +Subject: [PATCH 1/2] Remove empty variables from categories. + +Signed-off-by: Marko Saukko <[email protected]> +--- + .../meego_variant/aboutmydevice.cpcategory | 1 - + .../meego_variant/accessories.cpcategory | 3 --- + .../meego_variant/applications.cpcategory | 1 - + .../categories/meego_variant/battery.cpcategory | 3 --- + .../meego_variant/connections.cpcategory | 3 --- + .../categories/meego_variant/eventsfeed.cpcategory | 6 ------ + .../meego_variant/languagenkeyboard.cpcategory | 3 --- + .../meego_variant/notifications.cpcategory | 3 --- + .../meego_variant/personalize.cpcategory | 3 --- + .../categories/meego_variant/phone.cpcategory | 3 --- + .../categories/meego_variant/security.cpcategory | 3 --- + .../meego_variant/syncnbackup.cpcategory | 1 - + .../categories/meego_variant/timendate.cpcategory | 3 --- + 13 files changed, 0 insertions(+), 36 deletions(-) + +diff --git a/controlpanel/categories/meego_variant/aboutmydevice.cpcategory b/controlpanel/categories/meego_variant/aboutmydevice.cpcategory +index c7ebd47..4067abc 100644 +--- a/controlpanel/categories/meego_variant/aboutmydevice.cpcategory ++++ b/controlpanel/categories/meego_variant/aboutmydevice.cpcategory +@@ -9,7 +9,6 @@ Value-logical-id=qtn_sett_main_aboutmy_label2 + Icon=icon-m-settings-description + + Aliases="About,About my NXX" +-Translation-catalogs= + + Order=120 + +diff --git a/controlpanel/categories/meego_variant/accessories.cpcategory b/controlpanel/categories/meego_variant/accessories.cpcategory +index 70d761f..8fd59bf 100644 +--- a/controlpanel/categories/meego_variant/accessories.cpcategory ++++ b/controlpanel/categories/meego_variant/accessories.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_accessories_label2 + + Icon=icon-m-settings-accessories + +-Aliases= +-Translation-catalogs= +- + Order=100 + +diff --git a/controlpanel/categories/meego_variant/applications.cpcategory b/controlpanel/categories/meego_variant/applications.cpcategory +index 0a8ca66..4350974 100644 +--- a/controlpanel/categories/meego_variant/applications.cpcategory ++++ b/controlpanel/categories/meego_variant/applications.cpcategory +@@ -9,7 +9,6 @@ Value-logical-id=qtn_sett_main_applictions_label2 + Icon=icon-m-settings-applications + + Aliases=Uncategorized +-Translation-catalogs= + AppletSort=SortByTitle + + Order=30 +diff --git a/controlpanel/categories/meego_variant/battery.cpcategory b/controlpanel/categories/meego_variant/battery.cpcategory +index ecaa9f8..784a25a 100644 +--- a/controlpanel/categories/meego_variant/battery.cpcategory ++++ b/controlpanel/categories/meego_variant/battery.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_batterylabel2 + + Icon=icon-m-settings-battery + +-Aliases= +-Translation-catalogs= +- + Order=60 + +diff --git a/controlpanel/categories/meego_variant/connections.cpcategory b/controlpanel/categories/meego_variant/connections.cpcategory +index c09b0d0..c3e9375 100644 +--- a/controlpanel/categories/meego_variant/connections.cpcategory ++++ b/controlpanel/categories/meego_variant/connections.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_connections_label2 + + Icon=icon-m-common-wlan + +-Aliases= +-Translation-catalogs= +- + Order=10 + +diff --git a/controlpanel/categories/meego_variant/eventsfeed.cpcategory b/controlpanel/categories/meego_variant/eventsfeed.cpcategory +index e3f247a..6b97675 100644 +--- a/controlpanel/categories/meego_variant/eventsfeed.cpcategory ++++ b/controlpanel/categories/meego_variant/eventsfeed.cpcategory +@@ -3,12 +3,6 @@ Parent=Notifications + Name="Events feed" + Name-logical-id=qtn_home_events_settings_title + +-Value= +-Value-logical-id= +- +-Icon= +- +-Aliases= + Translation-catalogs=home + + Order=10 +diff --git a/controlpanel/categories/meego_variant/languagenkeyboard.cpcategory b/controlpanel/categories/meego_variant/languagenkeyboard.cpcategory +index 1345fe6..2894f4f 100644 +--- a/controlpanel/categories/meego_variant/languagenkeyboard.cpcategory ++++ b/controlpanel/categories/meego_variant/languagenkeyboard.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_language_label2 + + Icon=icon-m-common-keyboard + +-Aliases= +-Translation-catalogs= +- + Order=90 + +diff --git a/controlpanel/categories/meego_variant/notifications.cpcategory b/controlpanel/categories/meego_variant/notifications.cpcategory +index dd576f5..83de9f8 100644 +--- a/controlpanel/categories/meego_variant/notifications.cpcategory ++++ b/controlpanel/categories/meego_variant/notifications.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_notifications_label2 + + Icon=icon-m-settings-notification + +-Aliases= +-Translation-catalogs= +- + Order=40 + +diff --git a/controlpanel/categories/meego_variant/personalize.cpcategory b/controlpanel/categories/meego_variant/personalize.cpcategory +index 39fbd94..3329355 100644 +--- a/controlpanel/categories/meego_variant/personalize.cpcategory ++++ b/controlpanel/categories/meego_variant/personalize.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_presonalize_label2 + + Icon=icon-m-settings-personalize + +-Aliases= +-Translation-catalogs= +- + Order=50 + +diff --git a/controlpanel/categories/meego_variant/phone.cpcategory b/controlpanel/categories/meego_variant/phone.cpcategory +index d13e8fe..b519625 100644 +--- a/controlpanel/categories/meego_variant/phone.cpcategory ++++ b/controlpanel/categories/meego_variant/phone.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_phone_label2 + + Icon=icon-m-settings-call + +-Aliases= +-Translation-catalogs= +- + Order=20 + +diff --git a/controlpanel/categories/meego_variant/security.cpcategory b/controlpanel/categories/meego_variant/security.cpcategory +index 60e1353..ee7203b 100644 +--- a/controlpanel/categories/meego_variant/security.cpcategory ++++ b/controlpanel/categories/meego_variant/security.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_security_label2 + + Icon=icon-m-common-passcode + +-Aliases= +-Translation-catalogs= +- + Order=70 + +diff --git a/controlpanel/categories/meego_variant/syncnbackup.cpcategory b/controlpanel/categories/meego_variant/syncnbackup.cpcategory +index bb41c02..0431d46 100644 +--- a/controlpanel/categories/meego_variant/syncnbackup.cpcategory ++++ b/controlpanel/categories/meego_variant/syncnbackup.cpcategory +@@ -9,7 +9,6 @@ Value-logical-id=qtn_sett_main_syncbackup_label2 + Icon=icon-m-transfer-sync + + Aliases=qtn_sett_main_backup +-Translation-catalogs= + + Order=110 + +diff --git a/controlpanel/categories/meego_variant/timendate.cpcategory b/controlpanel/categories/meego_variant/timendate.cpcategory +index bb7ba6f..652d2ee 100644 +--- a/controlpanel/categories/meego_variant/timendate.cpcategory ++++ b/controlpanel/categories/meego_variant/timendate.cpcategory +@@ -8,8 +8,5 @@ Value-logical-id=qtn_sett_main_clock_label2 + + Icon=icon-m-settings-time-date + +-Aliases= +-Translation-catalogs= +- + Order=80 + +-- +1.7.6.5 + ++++++ 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch (new) --- 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch +++ 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch @@ -0,0 +1,75 @@ +From c35d828c84ef04dde0a9b8624724f700d6ada057 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Tue, 21 Feb 2012 17:19:46 +0200 +Subject: [PATCH 2/2] Add HideIfEmpty=1 to not used meego variant categories. + NOTE: This hides the categories always if the applets + within the category are not preloaded in + /etc/duicontrolpanel.conf + +Signed-off-by: Marko Saukko <[email protected]> +--- + .../categories/meego_variant/eventsfeed.cpcategory | 1 + + .../meego_variant/notifications.cpcategory | 1 + + .../categories/meego_variant/phone.cpcategory | 1 + + .../categories/meego_variant/security.cpcategory | 1 + + .../meego_variant/syncnbackup.cpcategory | 1 + + 5 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/controlpanel/categories/meego_variant/eventsfeed.cpcategory b/controlpanel/categories/meego_variant/eventsfeed.cpcategory +index 6b97675..19e994f 100644 +--- a/controlpanel/categories/meego_variant/eventsfeed.cpcategory ++++ b/controlpanel/categories/meego_variant/eventsfeed.cpcategory +@@ -5,5 +5,6 @@ Name-logical-id=qtn_home_events_settings_title + + Translation-catalogs=home + ++HideIfEmpty=1 + Order=10 + +diff --git a/controlpanel/categories/meego_variant/notifications.cpcategory b/controlpanel/categories/meego_variant/notifications.cpcategory +index 83de9f8..e688ae6 100644 +--- a/controlpanel/categories/meego_variant/notifications.cpcategory ++++ b/controlpanel/categories/meego_variant/notifications.cpcategory +@@ -8,5 +8,6 @@ Value-logical-id=qtn_sett_main_notifications_label2 + + Icon=icon-m-settings-notification + ++HideIfEmpty=1 + Order=40 + +diff --git a/controlpanel/categories/meego_variant/phone.cpcategory b/controlpanel/categories/meego_variant/phone.cpcategory +index b519625..a07428f 100644 +--- a/controlpanel/categories/meego_variant/phone.cpcategory ++++ b/controlpanel/categories/meego_variant/phone.cpcategory +@@ -8,5 +8,6 @@ Value-logical-id=qtn_sett_main_phone_label2 + + Icon=icon-m-settings-call + ++HideIfEmpty=1 + Order=20 + +diff --git a/controlpanel/categories/meego_variant/security.cpcategory b/controlpanel/categories/meego_variant/security.cpcategory +index ee7203b..0a4ff5d 100644 +--- a/controlpanel/categories/meego_variant/security.cpcategory ++++ b/controlpanel/categories/meego_variant/security.cpcategory +@@ -8,5 +8,6 @@ Value-logical-id=qtn_sett_main_security_label2 + + Icon=icon-m-common-passcode + ++HideIfEmpty=1 + Order=70 + +diff --git a/controlpanel/categories/meego_variant/syncnbackup.cpcategory b/controlpanel/categories/meego_variant/syncnbackup.cpcategory +index 0431d46..225a0fc 100644 +--- a/controlpanel/categories/meego_variant/syncnbackup.cpcategory ++++ b/controlpanel/categories/meego_variant/syncnbackup.cpcategory +@@ -10,5 +10,6 @@ Icon=icon-m-transfer-sync + + Aliases=qtn_sett_main_backup + ++HideIfEmpty=1 + Order=110 + +-- +1.7.6.5 + ++++++ meegotouch-controlpanel.yaml --- meegotouch-controlpanel.yaml +++ meegotouch-controlpanel.yaml @@ -1,15 +1,18 @@ Name: meegotouch-controlpanel Summary: MeeGo Control Panel -Version: 0.14.5 +Version: 0.14.7.1 Release: 1 Group: Application Framework/MeeGo Touch Settings License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanel[meego] +URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanel/ Sources: - - "%{name}-%{version}.tar.bz2" + - "meegotouch-%{name}-%{version}.tar.gz" Patches: - exchange_desktop.patch - meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch + - 0001-Remove-empty-variables-from-categories.patch + - 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch + Description: The meegotouch-controlpanel provides a common place for device and application settings in a pluggable way PkgConfigBR: - QtGui @@ -20,7 +23,6 @@ - libmeegocontrolpanel Configure: none Builder: qmake -SetupOptions: "-q -n %{name}-%{version}" Files: - "%attr(755,root,root) %{_bindir}/duicontrolpanel*" - "%{_libdir}/duicontrolpanel/applets/libdeclarative.so" ++++++ meegotouch-meegotouch-controlpanel-0.14.7.1.tar.gz (new) ++++++ deleted files: --- meegotouch-controlpanel-0.14.5.tar.bz2
