I have made the following changes intended for : CE:UX:MTF / meegotouch-compositor
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7477 Thank You, Robin Burchell [This message was auto-generated] --- Request # 7477: Messages from BOSS: State: review at 2012-11-29T15:27:16 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:w00t:branches:CE:UX:MTF / meegotouch-compositor -> CE:UX:MTF / meegotouch-compositor changes files: -------------- --- meegotouch-compositor.changes +++ meegotouch-compositor.changes @@ -0,0 +1,8 @@ +* Thu Nov 29 2012 Robin Burchell <[email protected]> - 1.2.0 +- Move files in packaging to yaml (from Robin) +- Create a tools package, move the (incorrectly placed) binaries from -devel to -tools (from Robin) +- Remove (now unused) .desktop files (from Robin) +- Roll in Nemo patches from packaging (from Robin) +- Fixes NEMO#237: Allow screenshotting with meta+p (similar grabbing as meta+backspace to open switcher) (from Robin) +- Revert "sort lockscreens before checking desktops", breaks things, not necessary (from Vesa) + old: ---- 0001-remove-lockscreen_painted-waiting-logic.patch 0001-sort-lockscreens-before-checking-desktops.patch 0012-systemd-ready-signal.patch BMC_14207_double_xterm_thumbnail.patch BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch BMC_22845_move-var-run-to-home.patch Use-QTransform-rather-than-the-deprecated-matrix-cla.patch X-MEEGO-HS.desktop XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch fix_animations_for_gestures_plugin.patch fix_tfp_on_lenovo.patch fix_windowctl_test_linkage.patch mdecorator.desktop meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch meegotouch-meegotouch-compositor-1.1.31-1.tar.gz new_test_definitions.patch new: ---- meegotouch-compositor-1.2.0.tar.bz2 spec files: ----------- --- meegotouch-compositor.spec +++ meegotouch-compositor.spec @@ -9,29 +9,14 @@ # << macros Summary: MeeGo UI Compositing Window Manager -Version: 1.1.31 +Version: 1.2.0 Release: 1 Group: System/Desktop License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-compositor -Source0: meegotouch-%{name}-%{version}-1.tar.gz -Source1: mdecorator.desktop -Source2: X-MEEGO-HS.desktop -Source3: mcompositor.service +URL: http://github.com/nemomobile/mcompositor +Source0: %{name}-%{version}.tar.bz2 +Source1: mcompositor.service Source100: meegotouch-compositor.yaml -Patch0: BMC_14207_double_xterm_thumbnail.patch -Patch1: XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch -Patch2: Use-QTransform-rather-than-the-deprecated-matrix-cla.patch -Patch3: fix_windowctl_test_linkage.patch -Patch4: new_test_definitions.patch -Patch5: BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch -Patch6: BMC_22845_move-var-run-to-home.patch -Patch7: fix_animations_for_gestures_plugin.patch -Patch8: fix_tfp_on_lenovo.patch -Patch9: meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch -Patch10: 0001-sort-lockscreens-before-checking-desktops.patch -Patch11: 0001-remove-lockscreen_painted-waiting-logic.patch -Patch12: 0012-systemd-ready-signal.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtDBus) @@ -60,7 +45,7 @@ Obsoletes: mcompositor < 0.4.6 %description -This package contains the Direct UI compositing window manager. +This package contains the Nemo Mobile compositing window manager. %package devel @@ -73,6 +58,15 @@ mcompositor decorators. +%package tools +Summary: Tools for debugging and interacting with mcompositor +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description tools +This package contains tools to interact with mcompositor. + + %package tests Summary: Test files for mcompositor Group: Development/Libraries @@ -85,34 +79,8 @@ %prep -%setup -q -n meegotouch-%{name} +%setup -q -n %{name} -# BMC_14207_double_xterm_thumbnail.patch -%patch0 -p1 -# XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch -%patch1 -p1 -# Use-QTransform-rather-than-the-deprecated-matrix-cla.patch -%patch2 -p1 -# fix_windowctl_test_linkage.patch -%patch3 -p1 -# new_test_definitions.patch -%patch4 -p1 -# BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch -%patch5 -p1 -# BMC_22845_move-var-run-to-home.patch -%patch6 -p1 -# fix_animations_for_gestures_plugin.patch -%patch7 -p1 -# fix_tfp_on_lenovo.patch -%patch8 -p1 -# meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch -%patch9 -p1 -# 0001-sort-lockscreens-before-checking-desktops.patch -%patch10 -p1 -# 0001-remove-lockscreen_painted-waiting-logic.patch -%patch11 -p1 -# 0012-systemd-ready-signal.patch -%patch12 -p1 # >> setup # << setup @@ -132,12 +100,8 @@ # >> install pre # << install pre %qmake_install -mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart -cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart -mkdir -p %{buildroot}%{_datadir}/xsessions/ -cp -a %{SOURCE2} %{buildroot}%{_datadir}/xsessions/ mkdir -p %{buildroot}%{_libdir}/systemd/user/ -cp -a %{SOURCE3} %{buildroot}%{_libdir}/systemd/user/ +cp -a %{SOURCE1} %{buildroot}%{_libdir}/systemd/user/ # >> install post @@ -150,62 +114,44 @@ %files %defattr(-,root,root,-) -# >> files %{_bindir}/mcompositor %{_bindir}/mdecorator %{_libdir}/libdecorator.so.* %{_libdir}/libmcompositor.so.* %{_datadir}/contextkit/providers/org.maemo.mcompositor.context %{_datadir}/l10n/meegotouch/recovery.qm -%config %{_sysconfdir}/xdg/autostart/mdecorator.desktop -%{_datadir}/xsessions/X-MEEGO-HS.desktop %{_libdir}/systemd/user/mcompositor.service +# >> files # << files %files devel %defattr(-,root,root,-) -# >> files devel -%{_bindir}/focus-tracker -%{_bindir}/windowctl -%{_bindir}/windowstack -%{_bindir}/manual-splash %{_libdir}/libdecorator.so %{_libdir}/libmcompositor.so -%{_includedir}/meegotouch/libdecorator/mabstractappinterface.h -%{_includedir}/meegotouch/libdecorator/mabstractdecorator.h -%{_includedir}/meegotouch/libdecorator/mdecorator_dbus_interface.h -%{_includedir}/meegotouch/libdecorator/mrmi.h -%{_includedir}/meegotouch/mcompositor/mcompatoms_p.h -%{_includedir}/meegotouch/mcompositor/mcompmgrextensionfactory.h -%{_includedir}/meegotouch/mcompositor/mcompositemanager.h -%{_includedir}/meegotouch/mcompositor/mcompositemanagerextension.h -%{_includedir}/meegotouch/mcompositor/mcompositewindow.h -%{_includedir}/meegotouch/mcompositor/mcompositewindowanimation.h -%{_includedir}/meegotouch/mcompositor/mcompositewindowgroup.h -%{_includedir}/meegotouch/mcompositor/mcompositewindowshadereffect.h -%{_includedir}/meegotouch/mcompositor/mdevicestate.h -%{_includedir}/meegotouch/mcompositor/mstatusbartexture.h -%{_includedir}/meegotouch/mcompositor/mtexturefrompixmap.h -%{_includedir}/meegotouch/mcompositor/mwindowpropertycache.h +%{_includedir}/meegotouch/libdecorator/*.h +%{_includedir}/meegotouch/mcompositor/*.h %{_datadir}/doc/mcompositor-l10n-engineering-english/recovery.ts %{_datadir}/doc/mcompositor/api/* +# >> files devel # << files devel +%files tools +%defattr(-,root,root,-) +%{_bindir}/focus-tracker +%{_bindir}/windowctl +%{_bindir}/windowstack +%{_bindir}/manual-splash +# >> files tools +# << files tools + %files tests %defattr(-,root,root,-) -# >> files tests -%{_libdir}/mcompositor-unit-tests/ut_anim -%{_libdir}/mcompositor-unit-tests/ut_closeapp -%{_libdir}/mcompositor-unit-tests/ut_compositing -%{_libdir}/mcompositor-unit-tests/ut_lockscreen -%{_libdir}/mcompositor-unit-tests/ut_netClientList -%{_libdir}/mcompositor-unit-tests/ut_restackwindows -%{_libdir}/mcompositor-unit-tests/ut_splashscreen -%{_libdir}/mcompositor-unit-tests/ut_stacking +%{_libdir}/mcompositor-unit-tests/ut_* %{_datadir}/mcompositor-functional-tests/splash.jpg %{_datadir}/mcompositor-unit-tests/tests.xml %{_bindir}/mcompositor-test-init.py %{_datadir}/mcompositor-functional-tests/tests.xml %{_datadir}/meegotouch/testscripts/mcompositor-functional-tests/test*.py %{_datadir}/meegotouch/testscripts/mcompositor-functional-tests/test*.sh +# >> files tests # << files tests other changes: -------------- ++++++ meegotouch-compositor-1.2.0.tar.bz2 (new) ++++++ meegotouch-compositor.yaml --- meegotouch-compositor.yaml +++ meegotouch-compositor.yaml @@ -1,32 +1,16 @@ Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager -Version: 1.1.31 +Version: 1.2.0 Release: 1 Group: System/Desktop License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-compositor +URL: http://github.com/nemomobile/mcompositor Sources: - - "meegotouch-%{name}-%{version}-1.tar.gz" + - "%{name}-%{version}.tar.bz2" ExtraSources: - - mdecorator.desktop;%{_sysconfdir}/xdg/autostart - - X-MEEGO-HS.desktop;%{_datadir}/xsessions/ - mcompositor.service;%{_libdir}/systemd/user/ -Patches: - - BMC_14207_double_xterm_thumbnail.patch - - XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch - - Use-QTransform-rather-than-the-deprecated-matrix-cla.patch - - fix_windowctl_test_linkage.patch - - new_test_definitions.patch - - BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch - - BMC_22845_move-var-run-to-home.patch - - fix_animations_for_gestures_plugin.patch - - fix_tfp_on_lenovo.patch - - meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch - - 0001-sort-lockscreens-before-checking-desktops.patch - - 0001-remove-lockscreen_painted-waiting-logic.patch - - 0012-systemd-ready-signal.patch Description: | - This package contains the Direct UI compositing window manager. + This package contains the Nemo Mobile compositing window manager. PkgConfigBR: - QtDBus - QtNetwork @@ -57,6 +41,15 @@ - mcompositor < 0.4.6 Configure: none Builder: qmake +Files: + - "%{_bindir}/mcompositor" + - "%{_bindir}/mdecorator" + - "%{_libdir}/libdecorator.so.*" + - "%{_libdir}/libmcompositor.so.*" + - "%{_datadir}/contextkit/providers/org.maemo.mcompositor.context" + - "%{_datadir}/l10n/meegotouch/recovery.qm" + - "%{_libdir}/systemd/user/mcompositor.service" + SubPackages: - Name: devel Summary: Development files for building mcompositor decorators @@ -64,10 +57,37 @@ Description: | This package contains the files necessary to develop mcompositor decorators. + Files: + - "%{_libdir}/libdecorator.so" + - "%{_libdir}/libmcompositor.so" + - "%{_includedir}/meegotouch/libdecorator/*.h" + - "%{_includedir}/meegotouch/mcompositor/*.h" + - "%{_datadir}/doc/mcompositor-l10n-engineering-english/recovery.ts" + - "%{_datadir}/doc/mcompositor/api/*" + + - Name: tools + Summary: Tools for debugging and interacting with mcompositor + Group: Development/Libraries + Description: | + This package contains tools to interact with mcompositor. + Files: + - "%{_bindir}/focus-tracker" + - "%{_bindir}/windowctl" + - "%{_bindir}/windowstack" + - "%{_bindir}/manual-splash" + - Name: tests Summary: Test files for mcompositor Group: Development/Libraries Description: | This package contains the files necessary to develop mcompositor decorators. + Files: + - "%{_libdir}/mcompositor-unit-tests/ut_*" + - "%{_datadir}/mcompositor-functional-tests/splash.jpg" + - "%{_datadir}/mcompositor-unit-tests/tests.xml" + - "%{_bindir}/mcompositor-test-init.py" + - "%{_datadir}/mcompositor-functional-tests/tests.xml" + - "%{_datadir}/meegotouch/testscripts/mcompositor-functional-tests/test*.py" + - "%{_datadir}/meegotouch/testscripts/mcompositor-functional-tests/test*.sh" ++++++ deleted files: --- 0001-remove-lockscreen_painted-waiting-logic.patch --- 0001-sort-lockscreens-before-checking-desktops.patch --- 0012-systemd-ready-signal.patch --- BMC_14207_double_xterm_thumbnail.patch --- BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch --- BMC_22845_move-var-run-to-home.patch --- Use-QTransform-rather-than-the-deprecated-matrix-cla.patch --- X-MEEGO-HS.desktop --- XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch --- fix_animations_for_gestures_plugin.patch --- fix_tfp_on_lenovo.patch --- fix_windowctl_test_linkage.patch --- mdecorator.desktop --- meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch --- meegotouch-meegotouch-compositor-1.1.31-1.tar.gz --- new_test_definitions.patch
