[meego-commits] 9763: Changes to devel:qt-mtf/meegotouch-inputmethodengine
araujo
no_reply at build.meego.com
Thu Nov 25 17:52:46 UTC 2010
Hi,
I have made the following changes to meegotouch-inputmethodengine in project devel:qt-mtf. Please review and accept ASAP.
Thank You,
araujo
[This message was auto-generated]
---
Request #9763:
submit: home:araujo:branches:devel:qt-mtf/meegotouch-inputmethodengine(r4)(cleanup) -> devel:qt-mtf/meegotouch-inputmethodengine
Message:
Update to version 0.3.3 (BMC#9948)
State: new 2010-11-25T09:52:45 araujo
Comment: None
changes files:
--------------
--- meegotouch-inputmethodengine.changes
+++ meegotouch-inputmethodengine.changes
@@ -0,0 +1,4 @@
+* Thu Nov 17 2010 Rakesh Cherian <ext-rakesh.cherian at nokia.com> - 0.3.3
+- Update to release tag 0.3.3-1
+- Separate test/dev packages from meegotouch-inputmethodengine (BMC#9948)
+
old:
----
meegotouch-inputmethodengine-0.3.0.tar.bz2
new:
----
meegotouch-inputmethodengine-0.3.3.tar.bz2
spec files:
-----------
--- meegotouch-inputmethodengine.spec
+++ meegotouch-inputmethodengine.spec
@@ -6,72 +6,116 @@
# << macros
Name: meegotouch-inputmethodengine
-Summary: Direct UI Input Method Engine
-Version: 0.3.0
+Summary: MeeGo UI Input Method Engine
+Version: 0.3.3
Release: 1
Group: System/Libraries
-License: LGPLv2.1
+License: LGPL v2.1
URL: http://www.meego.com
Source0: %{name}-%{version}.tar.bz2
Source100: meegotouch-inputmethodengine.yaml
Requires: %{name} >= %{version}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(QtCore) >= 4.6.0
+BuildRequires: pkgconfig(QtDBus)
+BuildRequires: pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(QtNetwork)
+BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-base-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(contextprovider-1.0)
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(meegotouch)
Provides: duiimengine > 0.1.12
Obsoletes: duiimengine <= 0.1.12
%description
-Direct UI Input Method Engine
+MeeGo UI Input Method Engine
%package devel
-Summary: Development files for the Direct UI Input Method Engine
+Summary: Development files for the MeeGo UI Input Method Engine
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
-This package contains the files necessary to develop duiimengine applications.
+This package contains the files necessary to develop meegoimengine application
+
+%package -n libmeegoimenginewords0
+Summary: Meego Touch Input Method Engine Framework library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libmeegoimenginewords0
+Meego Touch Input Method Engine Framework library, word correction/prediction
+
+%package -n libmeegoimenginewords-devel
+Summary: Meego Touch Input Method Engine Framework library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: meegotouch-inputmethodengine-devel
+%description -n libmeegoimenginewords-devel
+Meego Touch Input Method Engine Framework library, word correction/prediction
+
+%package tests
+Summary: Unit tests for the MeeGo UI Input Method Engine
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description tests
+This package contains the unit tests for MeeGo UI Input Method Engine
+
+%package dummydriver
+Summary: Dummy Driver for libmeegoimengine
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description dummydriver
+This package contains Dummy Driver for libmeegoimengine
%prep
%setup -q -n %{name}-%{version}
# >> setup
+%define _qt4_prefix %{_libdir}/qt4
# << setup
%build
# >> build pre
+export PATH=$PATH:/usr/lib/qt4/bin
+qmake
# << 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}
+make INSTALL_ROOT=%{buildroot} install
# << install pre
-%qmake_install
+%make_install
# >> install post
#Install tests alongside Qt examples
-mkdir -p %{buildroot}/%{_libdir}/qt4/tests
-mv %{buildroot}/%{_datadir}/libmeegoimengine-tests %{buildroot}/%{_libdir}/qt4/tests/libmeegoimengine-tests
+#mkdir -p %{buildroot}/%{_qt4_prefix}/tests
+#mv %{buildroot}/%{_datadir}/libmeegoimengine-tests %{buildroot}/%{_qt4_prefix}/tests/libmeegoimengine-tests
# Create a meegotouch-inputmethodengine ldconfig file - the tests cases need
# this in order to resolve the stub test libraries (stubdriver1 and stubdriver2)
@@ -81,9 +125,21 @@
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+
+
+
+
+
+%post -n libmeegoimenginewords0 -p /sbin/ldconfig
+
+%postun -n libmeegoimenginewords0 -p /sbin/ldconfig
+
+
+
+
+
@@ -92,22 +148,45 @@
%files
%defattr(-,root,root,-)
# >> files
-%{_libdir}/*.so.*
+%defattr(-, root, root, -)
# << files
%files devel
%defattr(-,root,root,-)
# >> files devel
-%config %{_sysconfdir}/ld.so.conf.d/meegotouch-inputmethodengine.conf
-%{_includedir}/meego/meegoimengine
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/meego-imengines/drivers/libdummyimdriver.so
-%{_libdir}/meego-imengines/drivers/libstubdriver1.so
-%{_libdir}/meego-imengines/drivers/libstubdriver2.so
-%{_libdir}/qt4/tests/libmeegoimengine-tests
+%{_includedir}/meego/meegoimengine/mimenginetypes.h
%{_datadir}/qt4/mkspecs/features/meegoimengine.prf
-%{_datadir}/qt4/mkspecs/features/meegoimenginewords.prf
+%config /etc/ld.so.conf.d/meegotouch-inputmethodengine.conf
# << files devel
+%files -n libmeegoimenginewords0
+%defattr(-,root,root,-)
+# >> files libmeegoimenginewords0
+%{_libdir}/libmeego*.so.*
+# << files libmeegoimenginewords0
+
+%files -n libmeegoimenginewords-devel
+%defattr(-,root,root,-)
+# >> files libmeegoimenginewords-devel
+%{_libdir}/*.so
+%{_datadir}/qt4/mkspecs/features/meegoimenginewords.prf
+%{_includedir}/meego/meegoimengine/mimenginewordsinterfacefactory.h
+%{_includedir}/meego/meegoimengine/mimenginewordsinterface.h
+%{_includedir}/meego/meegoimengine/MImEngineWordsInterface
+# << files libmeegoimenginewords-devel
+
+%files tests
+%defattr(-,root,root,-)
+# >> files tests
+%{_datadir}/libmeegoimengine-tests/*
+%{_libdir}/libmeegoimengine-tests/*
+%{_libdir}/meego-imengines/drivers/libstub*
+# << files tests
+
+%files dummydriver
+%defattr(-,root,root,-)
+# >> files dummydriver
+%{_libdir}/meego-imengines/drivers/libdummy*
+# << files dummydriver
+
other changes:
--------------
++++++ meegotouch-inputmethodengine-0.3.0.tar.bz2 -> meegotouch-inputmethodengine-0.3.3.tar.bz2
--- MeegoImEngine.pc
+++ MeegoImEngine.pc
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/qt4/meegoimengine
-
-Name: MeegoImEngineWords
-Description: Meego Touch Input Method Engine Framework
-Version: 0.1.0
-Cflags: -I${includedir}
-Libs: -L${libdir} -lmeegoimenginewords
-
--- debian/changelog
+++ debian/changelog
@@ -1,8 +1,14 @@
-libmeegoimengine (0.3.1~1) unstable; urgency=low
+libmeegoimengine (0.3.3-1) unstable; urgency=low
- * [UNRELEASED]
+ * new release
- -- huaming wang <huaming.wang at nokia.com> Wed, 03 Nov 2010 14:52:20 +0200
+ -- huaming wang <huaming.wang at nokia.com> Wed, 17 Nov 2010 13:40:20 +0200
+
+libmeegoimengine (0.3.2-1) unstable; urgency=low
+
+ * remove depleted pc files.
+
+ -- huaming wang <huaming.wang at nokia.com> Mon, 15 Nov 2010 11:11:54 +0200
libmeegoimengine (0.3.0-1) unstable; urgency=low
--- debian/libmeegoimengine-tests.install
+++ debian/libmeegoimengine-tests.install
@@ -1,2 +1,3 @@
/usr/share/libmeegoimengine-tests/
+/usr/lib/libmeegoimengine-tests/
/usr/lib/meego-imengines/drivers/libstub*
--- debian/rules
+++ debian/rules
@@ -76,6 +76,8 @@
dh_installdirs
# Add here commands to install the package into debian/tmp
+ # generate tests.xml
+ cd unit_test && ./gen-tests-xml.sh > tests.xml
INSTALL_ROOT=$(CURDIR)/debian/tmp make $(PARALLEL_MAKEFLAGS) install
--- meegoimengine.pro
+++ meegoimengine.pro
@@ -13,16 +13,12 @@
install_headers.path = $$MEEGOIMENGINE_INSTALL_HEADERS
install_headers.files = include/*
-install_pkgconfig.path = $$[QT_INSTALL_LIBS]/pkgconfig
-install_pkgconfig.files = MeegoImEngine.pc
-
install_prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
install_prf.files = meegoimengine.prf
INSTALLS += \
headers \
install_headers \
- install_pkgconfig \
install_prf \
QMAKE_EXTRA_TARGETS += check-xml
--- unit_test/common_check.pri
+++ unit_test/common_check.pri
@@ -16,6 +16,6 @@
QMAKE_CLEAN += *.log *.xml *~ *.html
-target.path = /usr/share/libmeegoimengine-tests/$$TARGET
+target.path = /usr/lib/libmeegoimengine-tests/$$TARGET
INSTALLS += target \
--- unit_test/gen-tests-xml.sh
+++ unit_test/gen-tests-xml.sh
+#!/bin/bash
+
+
+STARTUP_TEMPLATE="<case name=\"init_testcase\" description=\"Remove possible stale configuration file\" insignificant=\"true\" requirement=\"\" timeout=\"120\">
+ <step expected_result=\"0\">rm -f ~/.config/Nokia/MImEngineWordsInterface.conf</step>
+ </case>
+ "
+UT_STARTUP="${STARTUP_TEMPLATE}"
+
+UT_TESTCASES=""
+for TEST in `ls -d ut_*`; do
+ if [ -x $TEST/$TEST ]; then
+
+TESTCASE_TEMPLATE="<case name=\"$TEST\" description=\"$TEST\" requirement=\"\" timeout=\"120\">
+ <step expected_result=\"0\">LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/meego-imengines/drivers/ /usr/lib/libmeegoimengine-tests/$TEST/$TEST</step>
+ </case>
+ "
+
+ UT_TESTCASES="${UT_TESTCASES}${TESTCASE_TEMPLATE}"
+ fi
+done
+
+TESTSUITE_TEMPLATE="<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>
+<testdefinition version=\"0.1\">
+ <suite name=\"libmeegoimengine-tests\">
+ <set name=\"unit_tests\" description=\"Unit Tests\">
+
+ $UT_STARTUP
+ $UT_TESTCASES
+
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+
+ </set>
+ </suite>
+</testdefinition>"
+
+echo "$TESTSUITE_TEMPLATE"
+
--- unit_test/runtests.sh
+++ unit_test/runtests.sh
@@ -63,7 +63,7 @@
*)
# tests are run automated on TATAM infrastructure
TMPDIR=/tmp/libmeegoimengine-tests
- TESTBASE=/usr/share/libmeegoimengine-tests/
+ TESTBASE=/usr/lib/libmeegoimengine-tests/
export LD_LIBRARY_PATH=/usr/lib/meego-imengines/drivers/
rm -fr $TMPDIR && mkdir -p $TMPDIR
OUTSTYLE="xml"
--- unit_test/unit_test.pro
+++ unit_test/unit_test.pro
@@ -2,8 +2,9 @@
TEMPLATE = subdirs
SUBDIRS = mydriverstub mydriverstub2 ut_meegoimengine
+target.commands += $$system(touch tests.xml)
target.path = /usr/share/libmeegoimengine-tests/
-target.files = runtests.sh qtestlib2junitxml.xsl
+target.files = runtests.sh qtestlib2junitxml.xsl gen-tests-xml.sh tests.xml
INSTALLS += target
QMAKE_EXTRA_TARGETS += check-xml
--- words/MeegoImEngineWords.pc
+++ words/MeegoImEngineWords.pc
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/qt4/meegoimenginewords
-
-Name: MeegoImEngineWords
-Description: Meego Touch Input Method Engine Framework
-Version: 0.1.0
-Cflags: -I${includedir}
-Libs: -L${libdir} -lmeegoimenginewords
-
--- words/words.pro
+++ words/words.pro
@@ -37,16 +37,12 @@
install_headers.path = $$MEEGOIMENGINE_INSTALL_HEADERS
install_headers.files = include/*
-install_pkgconfig.path = $$[QT_INSTALL_LIBS]/pkgconfig
-install_pkgconfig.files = MeegoImEngineWords.pc
-
install_prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
install_prf.files = meegoimenginewords.prf
INSTALLS += target \
headers \
install_headers \
- install_pkgconfig \
install_prf \
QMAKE_EXTRA_TARGETS += check-xml
++++++ meegotouch-inputmethodengine.yaml
--- meegotouch-inputmethodengine.yaml
+++ meegotouch-inputmethodengine.yaml
@@ -1,35 +1,67 @@
Name: meegotouch-inputmethodengine
-Summary: Direct UI Input Method Engine
-Version: 0.3.0
+Summary: MeeGo UI Input Method Engine
+Version: 0.3.3
Release: 1
Group: System/Libraries
-License: LGPLv2.1
+License: LGPL v2.1
URL: http://www.meego.com
Sources:
- "%{name}-%{version}.tar.bz2"
Requires:
- "%{name} >= %{version}"
Description: |
- Direct UI Input Method Engine
+ MeeGo UI Input Method Engine
+
PkgConfigBR:
- QtCore >= 4.6.0
+ - QtDBus
+ - QtOpenGL
+ - QtNetwork
+ - QtGui
- gstreamer-0.10
- gstreamer-base-0.10
- gstreamer-plugins-base-0.10
- dbus-1
- xdamage
+ - icu-uc
- x11
- gconf-2.0
- contextprovider-1.0
+ - gl
+ - meegotouch
+
Provides:
- duiimengine > 0.1.12
Obsoletes:
- duiimengine <= 0.1.12
+
Configure: none
-Builder: qmake
+Builder: make
SubPackages:
- Name: devel
- Summary: Development files for the Direct UI Input Method Engine
+ Summary: Development files for the MeeGo UI Input Method Engine
Group: Development/Libraries
- Description: |
- This package contains the files necessary to develop duiimengine applications.
+ Description: This package contains the files necessary to develop meegoimengine application
+
+ - Name: libmeegoimenginewords0
+ AsWholeName: yes
+ Summary: Meego Touch Input Method Engine Framework library
+ Group: Development/Libraries
+ Description: Meego Touch Input Method Engine Framework library, word correction/prediction
+
+ - Name: libmeegoimenginewords-devel
+ AsWholeName: yes
+ Summary: Meego Touch Input Method Engine Framework library
+ Group: Development/Libraries
+ Description: Meego Touch Input Method Engine Framework library, word correction/prediction
+ Requires: meegotouch-inputmethodengine-devel
+
+ - Name: tests
+ Summary: Unit tests for the MeeGo UI Input Method Engine
+ Group: Development/Libraries
+ Description: This package contains the unit tests for MeeGo UI Input Method Engine
+
+ - Name: dummydriver
+ Summary: Dummy Driver for libmeegoimengine
+ Group: Development/Libraries
+ Description: This package contains Dummy Driver for libmeegoimengine
More information about the MeeGo-commits
mailing list