[meego-commits] 9147: Changes to devel:qt-mtf/meegotouch-inputmethodframework

[rcherian]

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

Thank You,
rcherian

[This message was auto-generated]

---

Request #9147:

  submit:   home:rcherian/meegotouch-inputmethodframework(r9) -> devel:qt-mtf/meegotouch-inputmethodframework


Message:
    Adding unit tests to test packages

State:   new          2010-11-02T06:16:18 rcherian
Comment: None



changes files:
--------------
--- meegotouch-inputmethodframework.changes
+++ meegotouch-inputmethodframework.changes
@@ -0,0 +1,3 @@
+* 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
@@ -31,11 +31,11 @@
 BuildRequires:  pkgconfig(meegotouch)
 BuildRequires:  pkgconfig(meegotouch-feedback)
 BuildRequires:  pkgconfig(meegotouch-feedbackreactionmaps)
-BuildRequires:  pkgconfig(meegotouch-controlpanel)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  fdupes
+BuildRequires:  libmeegocontrolpanel-devel
 Provides:   duiimframework >= 0.19.0
 Provides:   meegoimframework > 0.19.2
 Obsoletes:   duiimframework < 0.19.0
@@ -86,11 +86,13 @@
 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}
+#export INSTALL_ROOT=%{buildroot}
+make INSTALL_ROOT=%{buildroot} install
 
 # Hack to work around broken install
 cd src && qmake && cd -
@@ -105,10 +107,10 @@
 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
+#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
+#rm %{buildroot}/usr/share/meego-im-framework-tests/tests.xml
 # << install post
 
 %pre
@@ -163,11 +165,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 +172,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,8 @@
 
 PkgBR:
     - fdupes
+    - libmeegocontrolpanel-devel
+
 PkgConfigBR:
     - QtCore >= 4.6.0
     - QtDBus
@@ -24,10 +26,10 @@
     - meegotouch
     - meegotouch-feedback
     - meegotouch-feedbackreactionmaps
-    - meegotouch-controlpanel
     - x11
     - xfixes
     - xext
+
 Provides:
     - duiimframework >= 0.19.0
     - meegoimframework > 0.19.2
@@ -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: |