Why the change of switching to libmeegotouchpanel-devel from pkg(libmeegotouchpanel)?
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Kaitlin Rupert > Sent: Wednesday, November 03, 2010 3:36 AM > To: [email protected] > Subject: [meego-commits] 9158: Changes to > Trunk:Testing/meegotouch-inputmethodframework > > 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 #9158: > > submit: devel:qt-mtf/meegotouch-inputmethodframework(r26) -> > Trunk:Testing/meegotouch-inputmethodframework > > > Message: > * Wed Oct 12 2010 Kaitlin Rupert <[email protected]> - 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 <[email protected]> - 0.19.20 > - Updated testpackages to include unit tests > > State: new 2010-11-02T12:35:43 krupert > Comment: None > > > > changes files: > -------------- > --- meegotouch-inputmethodframework.changes > +++ meegotouch-inputmethodframework.changes > @@ -0,0 +1,7 @@ > +* Wed Oct 12 2010 Kaitlin Rupert <[email protected]> - 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 <[email protected]> - 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 > @@ -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/meegoi > mframework.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_mi > msettingsapplet > -%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimapplication/ut_mima > pplication > -%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsconf/ut_mim > settingsconf > -%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsdialog/ut_mi > msettingsdialog > -%{_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_mi > msettingsapplet > -%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimapplication/ut_mima > pplication > -%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsconf/ut_mim > settingsconf > -%{_libdir}/qt4/tests/meego-im-framework-tests/ut_mimsettingsdialog/ut_mi > msettingsdialog > -%{_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 > @@ -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: | > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
