[meego-commits] 6530: Changes to Trunk/meegotouch-systemui

[Anas Nashif]

Hi,
I have made the following changes to meegotouch-systemui in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #6530:

  submit:   Trunk:Testing/meegotouch-systemui(r7) -> Trunk/meegotouch-systemui


Message:
    Move to Trunk

State:   new          2010-08-12T10:28:34 nashif
Comment: None



changes files:
--------------
--- meegotouch-systemui.changes
+++ meegotouch-systemui.changes
@@ -0,0 +1,3 @@
+* Wed Aug 11 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.16.6
+- Remove redundant Qt BuildRequires and add x11
+

spec files:
-----------
--- meegotouch-systemui.spec
+++ meegotouch-systemui.spec
@@ -22,7 +22,6 @@
 BuildRequires:  pkgconfig(QtCore) >= 4.6.0
 BuildRequires:  pkgconfig(QtGui)
 BuildRequires:  pkgconfig(messageserver)
-BuildRequires:  pkgconfig(Qt)
 BuildRequires:  pkgconfig(icu)
 BuildRequires:  pkgconfig(meegotouch)
 BuildRequires:  pkgconfig(dbus-1)
@@ -31,6 +30,7 @@
 BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(x11)
 BuildRequires:  fdupes
 BuildRequires:  desktop-file-utils
 Provides:   duistatusindicatormenu > 0.18.1
@@ -66,7 +66,7 @@
 
 %build
 # >> build pre
-qmake-qt4
+qmake
 # << build pre
 
 
@@ -99,9 +99,13 @@
 
 %post
 # >> post
-if [ ! -e /usr/share/pixmaps/icons-Applications-lock.png ]; then
-cp /usr/share/themes/base/meegotouch/sysuid/images/flat_drop_big_lock.png /usr/share/pixmaps/icons-Applications-lock.png
-fi
+#The lock icon has been removed from meegotouch-systemui need to find a 
+#replacement icon
+
+#if [ ! -e /usr/share/pixmaps/icons-Applications-lock.png ]; then
+#cp /usr/share/themes/base/meegotouch/sysuid/images/flat_drop_big_lock.png /usr/share/pixmaps/icons-Applications-lock.png
+#fi
+
 # << post
 
 
@@ -115,13 +119,13 @@
 %config /etc/dbus-1/system.d/systemui.conf
 %config /etc/xdg/autostart/meegotouch-systemui.desktop
 %{_bindir}/sysuid
-%{_libdir}/qt4/mkspecs/features/system-ui.prf
 %{_datadir}/applications/lock.desktop
 %{_datadir}/l10n/meegotouch/systemui.qm
 %{_datadir}/meegotouch/notifications/eventtypes
 %{_datadir}/themes/base/meegotouch/sysuid/style
-%{_datadir}/themes/base/meegotouch/sysuid/svg
 %{_datadir}/themes/base/meegotouch/sysuid/sysuid.conf
+%{_datadir}/themes/base/meegotouch/sysuid/svg/icon-s-status-notifier.svg
+%{_datadir}/themes/base/meegotouch/sysuid/svg/test.svg
 # << files
 
 
@@ -129,5 +133,6 @@
 %defattr(-,root,root,-)
 # >> files devel
 %{_includedir}/system-ui/*
+%{_datadir}/qt4/mkspecs/features/system-ui.prf
 # << files devel
 

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

++++++ meegotouch-systemui.yaml
--- meegotouch-systemui.yaml
+++ meegotouch-systemui.yaml
@@ -22,7 +22,6 @@
     - QtCore >= 4.6.0
     - QtGui
     - messageserver
-    - Qt
     - icu
     - meegotouch
     - dbus-1
@@ -31,6 +30,7 @@
     - xdamage
     - glib-2.0
     - dbus-glib-1
+    - x11
 Provides :
     - duistatusindicatormenu > 0.18.1
     - systemui > 0.1