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/4889

Thank You,
Marko Saukko

[This message was auto-generated]

---

Request # 4889:

Messages from BOSS:

State: review at 2012-05-22T12:49:14 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,4 @@
+* Tue May 22 2012 Marko Saukko <[email protected]> - 0.14.7.1
+- Added missing libqml.so file to main package
+- Remove excludes from examples applet.
+

new:
----
  meegotouch-controlpanel-rpmlintrc

spec files:
-----------
--- meegotouch-controlpanel.spec
+++ meegotouch-controlpanel.spec
@@ -13,13 +13,13 @@
 License:    LGPLv2.1
 URL:        http://meego.gitorious.org/meegotouch/meegotouch-controlpanel/
 Source0:    meegotouch-%{name}-%{version}.tar.gz
+Source1:    %{name}-rpmlintrc
 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)
 BuildRequires:  pkgconfig(meegotouch)
 BuildRequires:  pkgconfig(clean-device)
@@ -53,7 +53,7 @@
 
 
 %package -n meegotouch-controlpanel-tests
-Summary:    meegotouch-controlpanel and libmeegocontrolpanel functional and 
unit tests
+Summary:    Functional and unit tests for meegotouch-controlpanel and 
libmeegocontrolpanel
 Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   meegotouch-controlpanel = %{version}
@@ -160,12 +160,13 @@
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/duicontrolpanel*
 %{_libdir}/duicontrolpanel/applets/libdeclarative.so
+%{_libdir}/duicontrolpanel/applets/libqml.so
 %{_datadir}/themes/base/meegotouch/duicontrolpanel/style/duicontrolpanel.*
 %{_datadir}/applications/mtf-settings.desktop
 %{_datadir}/duicontrolpanel/categories/*
 %{_datadir}/dbus-1/*
 %{_sysconfdir}/meego-rfs-scripts/controlpanel-rfs.sh
-%{_sysconfdir}/duicontrolpanel.conf
+%config %{_sysconfdir}/duicontrolpanel.conf
 %{_libdir}/qt4/imports/com/nokia/controlpanel/DcpPageTitle.qml
 %{_libdir}/qt4/imports/com/nokia/controlpanel/DcpToolBar.qml
 %{_libdir}/qt4/imports/com/nokia/controlpanel/qmldir
@@ -206,11 +207,17 @@
 
 %files -n meegotouchcp-skeleton
 %defattr(-,root,root,-)
-%exclude %{_libdir}/duicontrolpanel/applets/*.so
-%exclude %{_datadir}/duicontrolpanel/desktops/*.desktop
-%exclude %{_datadir}/duicontrolpanel/uidescriptions/example*.xml
-%exclude 
%{_datadir}/themes/base/meegotouch/libdcpskeletonapplet/style/libdcpskeletonapplet.css
-%exclude %{_datadir}/duicontrolpanel/qml-exampl*
+%{_libdir}/duicontrolpanel/applets/libdcpcomboboxapplet.so
+%{_libdir}/duicontrolpanel/applets/libdcpmultipageapplet.so
+%{_libdir}/duicontrolpanel/applets/libdcpsheetapplet.so
+%{_libdir}/duicontrolpanel/applets/libdcpskel*.so
+%{_libdir}/duicontrolpanel/applets/libdcptoggleexampleapplet.so
+%{_datadir}/duicontrolpanel/desktops/*example*.desktop
+%{_datadir}/duicontrolpanel/desktops/externalapp.desktop
+%{_datadir}/duicontrolpanel/desktops/skel*.desktop
+%{_datadir}/duicontrolpanel/uidescriptions/example*.xml
+%{_datadir}/themes/base/meegotouch/libdcpskeletonapplet/style/libdcpskeletonapplet.css
+%{_datadir}/duicontrolpanel/qml-exampl*
 # >> files meegotouchcp-skeleton
 # << files meegotouchcp-skeleton
 

other changes:
--------------

++++++ meegotouch-controlpanel-rpmlintrc (new)
--- meegotouch-controlpanel-rpmlintrc
+++ meegotouch-controlpanel-rpmlintrc
@@ -0,0 +1 @@
+addFilter("meegotouchcp-skeleton.* arch-dependent-file-in-usr-share")

++++++ meegotouch-controlpanel.yaml
--- meegotouch-controlpanel.yaml
+++ meegotouch-controlpanel.yaml
@@ -7,6 +7,7 @@
 URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanel/
 Sources:
     - "meegotouch-%{name}-%{version}.tar.gz"
+    - "%{name}-rpmlintrc"
 Patches:
     - exchange_desktop.patch
     - meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch
@@ -20,18 +21,18 @@
     - clean-device
 Requires:
     - meegotouch-controlpanel-l10n-engineering-english
-    - libmeegocontrolpanel
 Configure: none
 Builder: qmake
 Files:
     - "%attr(755,root,root) %{_bindir}/duicontrolpanel*"
     - "%{_libdir}/duicontrolpanel/applets/libdeclarative.so"
+    - "%{_libdir}/duicontrolpanel/applets/libqml.so"
     - 
"%{_datadir}/themes/base/meegotouch/duicontrolpanel/style/duicontrolpanel.*"
     - "%{_datadir}/applications/mtf-settings.desktop"
     - "%{_datadir}/duicontrolpanel/categories/*"
     - "%{_datadir}/dbus-1/*"
     - "%{_sysconfdir}/meego-rfs-scripts/controlpanel-rfs.sh"
-    - "%{_sysconfdir}/duicontrolpanel.conf"
+    - "%config %{_sysconfdir}/duicontrolpanel.conf"
     - "%{_libdir}/qt4/imports/com/nokia/controlpanel/DcpPageTitle.qml"
     - "%{_libdir}/qt4/imports/com/nokia/controlpanel/DcpToolBar.qml"
     - "%{_libdir}/qt4/imports/com/nokia/controlpanel/qmldir"
@@ -78,7 +79,7 @@
 
  - Name: meegotouch-controlpanel-tests
    AsWholeName: True
-   Summary: meegotouch-controlpanel and libmeegocontrolpanel functional and 
unit tests
+   Summary: Functional and unit tests for meegotouch-controlpanel and 
libmeegocontrolpanel
    Group: System/Libraries
    Requires:
        - meegotouch-controlpanel = %{version}
@@ -105,11 +106,17 @@
    Requires:
        - meegotouchcp-skeleton-l10n-engineering-english
    Files:  
-       - "%exclude %{_libdir}/duicontrolpanel/applets/*.so"
-       - "%exclude %{_datadir}/duicontrolpanel/desktops/*.desktop"
-       - "%exclude %{_datadir}/duicontrolpanel/uidescriptions/example*.xml"
-       - "%exclude 
%{_datadir}/themes/base/meegotouch/libdcpskeletonapplet/style/libdcpskeletonapplet.css"
-       - "%exclude %{_datadir}/duicontrolpanel/qml-exampl*"
+       - "%{_libdir}/duicontrolpanel/applets/libdcpcomboboxapplet.so"
+       - "%{_libdir}/duicontrolpanel/applets/libdcpmultipageapplet.so"
+       - "%{_libdir}/duicontrolpanel/applets/libdcpsheetapplet.so"
+       - "%{_libdir}/duicontrolpanel/applets/libdcpskel*.so"
+       - "%{_libdir}/duicontrolpanel/applets/libdcptoggleexampleapplet.so"
+       - "%{_datadir}/duicontrolpanel/desktops/*example*.desktop"
+       - "%{_datadir}/duicontrolpanel/desktops/externalapp.desktop"
+       - "%{_datadir}/duicontrolpanel/desktops/skel*.desktop"
+       - "%{_datadir}/duicontrolpanel/uidescriptions/example*.xml"
+       - 
"%{_datadir}/themes/base/meegotouch/libdcpskeletonapplet/style/libdcpskeletonapplet.css"
+       - "%{_datadir}/duicontrolpanel/qml-exampl*"
    Description: |
       This package contains examples for settings applets created by 
implementing a dynamic plugin, declarative ui, declaration of starting an 
external application
 



Reply via email to