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

[Kaitlin Rupert]

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

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #9189:

  submit:   devel:qt-mtf/meegotouch-inputmethodframework(r27) -> Trunk:Testing/meegotouch-inputmethodframework


Message:
    * Wed Oct 12 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.19.20
- Use qmake builder option in yaml; remove obsolete qmake call in spec
- Add a rule in spec to generate meegoimframework.prf before calling qmake
* Wed Oct 12 2010 Rakesh Cherian <rakeshcherian at gmail.com> - 0.19.20
- Updated testpackages to include unit tests

NOTE:  **Use pkgconfig(meegotouch-controlpanel)

State:   new          2010-11-03T14:53:21 krupert
Comment: None



changes files:
--------------
--- meegotouch-inputmethodframework.changes
+++ meegotouch-inputmethodframework.changes
@@ -0,0 +1,7 @@
+* Wed Oct 12 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.19.20
+- Use qmake builder option in yaml; remove obsolete qmake call in spec
+- Add a rule in spec to generate meegoimframework.prf before calling qmake
+
+* Wed Oct 12 2010 Rakesh Cherian <rakeshcherian at gmail.com> - 0.19.20
+- Updated testpackages to include unit tests
+

spec files:
-----------
--- meegotouch-inputmethodframework.spec
+++ meegotouch-inputmethodframework.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.19
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
@@ -79,36 +79,27 @@
 export PATH=$PATH:/usr/lib/qt4/bin
 # Set ENABLE_MULTITOUCH to false for now as not all devices support it
 sed -e 's|ENABLE_MULTITOUCH|false|' > meego-im-framework.schemas < meego-im-framework.schemas.in
-qmake
+sed -e "s:M_IM_FRAMEWORK_FEATURE::g" %{_builddir}/%{?buildsubdir}/src/meegoimframework.prf.in > %{_builddir}/%{?buildsubdir}/src/meegoimframework.prf
 # << build pre
 
+%qmake 
 
 make %{?jobs:-j%jobs}
 
 # >> build post
+cd tests && ./gen-tests-xml.sh > tests.xml
 # << build post
 %install
 rm -rf %{buildroot}
 # >> install pre
-export INSTALL_ROOT=%{buildroot}
-
-# Hack to work around broken install
-cd src && qmake && cd -
-
 # << install pre
-%make_install 
+%qmake_install
 
 # >> install post
 %fdupes %{buildroot}%{_libdir}
 
 mkdir -p %{buildroot}/etc/xdg/autostart
 cp %{SOURCE1} %{buildroot}/etc/xdg/autostart
-
-#Install tests alongside Qt examples
-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
 # << install post
 
 %pre
@@ -163,11 +154,6 @@
 # >> files devel
 %{_libdir}/*.so
 %{_includedir}/meegotouch/meegoimframework
-%{_libdir}/qt4/tests/meego-im-framework-tests/ft_mimsettingsapplet/ft_mimsettingsapplet
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimapplication/ut_mimapplication
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsconf/ut_mimsettingsconf
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsdialog/ut_mimsettingsdialog
-%{_datadir}/meego-im-framework-tests
 %{_datadir}/qt4/mkspecs/features/meegoimframework.prf
 %{_libdir}/pkgconfig/*.pc
 # << files devel
@@ -175,19 +161,7 @@
 %files tests
 %defattr(-,root,root,-)
 # >> files tests
-%{_libdir}/qt4/tests/meego-im-framework-tests/plugins/*.so
-%{_libdir}/qt4/tests/meego-im-framework-tests/ft_mimpluginmanager
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimpluginmanager
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_minputcontext
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_minputcontextplugin
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mtoolbardata
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mtoolbaritem
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mtoolbarmanager
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_passthroughserver
-%{_libdir}/qt4/tests/meego-im-framework-tests/ft_mimsettingsapplet/ft_mimsettingsapplet
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimapplication/ut_mimapplication
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsconf/ut_mimsettingsconf
-%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsdialog/ut_mimsettingsdialog
-%{_datadir}/meego-im-framework-tests
+%{_libdir}/meego-im-framework-tests/
+%{_datadir}/meego-im-framework-tests/
 # << files tests
 

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

++++++ meegotouch-inputmethodframework.yaml
--- meegotouch-inputmethodframework.yaml
+++ meegotouch-inputmethodframework.yaml
@@ -12,6 +12,7 @@
 
 PkgBR:
     - fdupes
+
 PkgConfigBR:
     - QtCore >= 4.6.0
     - QtDBus
@@ -28,6 +29,7 @@
     - x11
     - xfixes
     - xext
+
 Provides:
     - duiimframework >= 0.19.0
     - meegoimframework > 0.19.2
@@ -36,7 +38,7 @@
     - meegoimframework <= 0.19.2
 
 Configure: none
-Builder: make
+Builder: qmake
 SubPackages:
     - Name: devel
       Summary: MeeGo UI Input Method Development Package
@@ -45,7 +47,7 @@
           This package contains the files necessary to develop
           input method plugins for MeeGo
 
-    - Name: tests 
+    - Name: tests
       Summary: MeeGo UI Input Method Tests Package
       Group: Development/Libraries
       Description: |