[meego-commits] 6528: Changes to Trunk/meegotouch-inputmethodframework

[Anas Nashif]

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

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #6528:

  submit:   Trunk:Testing/meegotouch-inputmethodframework(r5) -> Trunk/meegotouch-inputmethodframework


Message:
    Move to Trunk

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



changes files:
--------------
--- meegotouch-inputmethodframework.changes
+++ meegotouch-inputmethodframework.changes
@@ -0,0 +1,4 @@
+* Wed Aug 11 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.19.8
+- Include x11, xfixes, and xext BuildRequires. Remove QtMultimedia
+- Change mkspecs install location due to qt update 
+

spec files:
-----------
--- meegotouch-inputmethodframework.spec
+++ meegotouch-inputmethodframework.spec
@@ -20,7 +20,6 @@
 BuildRequires:  pkgconfig(QtCore) >= 4.6.0
 BuildRequires:  pkgconfig(QtDBus)
 BuildRequires:  pkgconfig(QtOpenGL)
-BuildRequires:  pkgconfig(QtMultimedia)
 BuildRequires:  pkgconfig(QtNetwork)
 BuildRequires:  pkgconfig(QtGui)
 BuildRequires:  pkgconfig(dbus-1)
@@ -30,6 +29,9 @@
 BuildRequires:  pkgconfig(meegotouch-feedback)
 BuildRequires:  pkgconfig(meegotouch-feedbackreactionmaps)
 BuildRequires:  pkgconfig(meegotouch-controlpanel)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xext)
 BuildRequires:  fdupes
 Provides:   duiimframework >= 0.19.0
 Provides:   meegoimframework > 0.19.2
@@ -56,6 +58,7 @@
 %setup -q -n %{name}-%{version}
 
 # >> setup
+%define _qt4_prefix %{_libdir}/qt4
 # << setup
 
 %build
@@ -87,7 +90,7 @@
 cp %{SOURCE1} %{buildroot}/etc/xdg/autostart
 
 #Install tests alongside Qt examples
-mkdir %{buildroot}/%{_qt4_prefix}/tests
+mkdir -p %{buildroot}/%{_qt4_prefix}/tests
 mv %{buildroot}/%{_libdir}/meego-im-framework-tests %{buildroot}/%{_libdir}/qt4/tests/meego-im-framework-tests
 
 rm %{buildroot}/usr/share/meego-im-framework-tests/tests.xml
@@ -134,7 +137,7 @@
 %{_libdir}/qt4/tests/meego-im-framework-tests/ut_mtoolbarmanager
 %{_libdir}/qt4/tests/meego-im-framework-tests/ut_passthroughserver
 %{_datadir}/meego-im-framework-tests
-%{_libdir}/qt4/mkspecs/features/meegoimframework.prf
+%{_datadir}/qt4/mkspecs/features/meegoimframework.prf
 %{_libdir}/pkgconfig/*.pc
 # << files devel
 

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

++++++ meegotouch-inputmethodframework.yaml
--- meegotouch-inputmethodframework.yaml
+++ meegotouch-inputmethodframework.yaml
@@ -16,7 +16,6 @@
     - QtCore >= 4.6.0
     - QtDBus
     - QtOpenGL
-    - QtMultimedia
     - QtNetwork
     - QtGui
     - dbus-1
@@ -26,7 +25,9 @@
     - meegotouch-feedback
     - meegotouch-feedbackreactionmaps
     - meegotouch-controlpanel
-
+    - x11
+    - xfixes
+    - xext
 Provides:
     - duiimframework >= 0.19.0
     - meegoimframework > 0.19.2