From 6f3540afb515afe5bf51e4777164d489b1aa056c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pertti=20Kellom=C3=A4ki?= Date: Tue, 31 Aug 2010 15:02:49 +0300 Subject: [PATCH] Changes: Updated and improved MeeGo packaging. - Updated to 0.12.1 - Reorganized RPM packaging files. - Moved binaries from /usr/share to /usr/lib in MeeGo install. - Added installation of applauncherd.desktop so that applauncherd is started by default with the UI. --- ...bin-ruby-instead-of-usr-bin-ruby1.8-.patch | 35 ++++ ...-install-file-etc-xdg-autostart-appl.patch | 37 ++++ meego/0.12.1/create-tarball.sh | 9 + meego/0.12.1/meegotouch-applauncherd.changes | 11 ++ meego/0.12.1/meegotouch-applauncherd.spec | 178 ++++++++++++++++++ meego/0.12.1/meegotouch-applauncherd.yaml | 94 +++++++++ meego/README | 9 +- meego/applauncherd.desktop | 4 + meego/meegotouch-applauncherd.changes | 5 - meego/meegotouch-applauncherd.yaml | 33 ---- 10 files changed, 373 insertions(+), 42 deletions(-) create mode 100644 meego/0.12.1/0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch create mode 100644 meego/0.12.1/0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch create mode 100644 meego/0.12.1/create-tarball.sh create mode 100644 meego/0.12.1/meegotouch-applauncherd.changes create mode 100644 meego/0.12.1/meegotouch-applauncherd.spec create mode 100644 meego/0.12.1/meegotouch-applauncherd.yaml create mode 100644 meego/applauncherd.desktop delete mode 100644 meego/meegotouch-applauncherd.changes delete mode 100644 meego/meegotouch-applauncherd.yaml diff --git a/meego/0.12.1/0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch b/meego/0.12.1/0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch new file mode 100644 index 0000000..b0d7860 --- /dev/null +++ b/meego/0.12.1/0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch @@ -0,0 +1,35 @@ +From 89f06418c0b10ca34445c6072c3d22c1c0080ce6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pertti=20Kellom=C3=A4ki?= +Date: Mon, 30 Aug 2010 10:18:34 +0300 +Subject: [PATCH] Changes: use /usr/bin/ruby instead of /usr/bin/ruby1.8 in test scripts. + The reason for this is that rpmbuild picks up a dependence + to /usr/bin/ruby1.8 which is not provided by any package. + +--- + tests/TestScripts/tc_theming.rb | 2 +- + tests/TestScripts/ts_prestartapp.rb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/TestScripts/tc_theming.rb b/tests/TestScripts/tc_theming.rb +index e48ce17..a63a885 100755 +--- a/tests/TestScripts/tc_theming.rb ++++ b/tests/TestScripts/tc_theming.rb +@@ -1,4 +1,4 @@ +-#!/usr/bin/ruby1.8 ++#!/usr/bin/ruby + # + # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + # All rights reserved. +diff --git a/tests/TestScripts/ts_prestartapp.rb b/tests/TestScripts/ts_prestartapp.rb +index 6da6918..79c42c0 100755 +--- a/tests/TestScripts/ts_prestartapp.rb ++++ b/tests/TestScripts/ts_prestartapp.rb +@@ -1,4 +1,4 @@ +-#!/usr/bin/ruby1.8 ++#!/usr/bin/ruby + # + # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + # All rights reserved. +-- +1.7.0.4 + diff --git a/meego/0.12.1/0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch b/meego/0.12.1/0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch new file mode 100644 index 0000000..ae772e3 --- /dev/null +++ b/meego/0.12.1/0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch @@ -0,0 +1,37 @@ +From 1774f02e56d968bd1d36ad3e562355510dcdfb8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pertti=20Kellom=C3=A4ki?= +Date: Wed, 1 Sep 2010 15:22:16 +0300 +Subject: [PATCH] Changes: In MeeGo, install file /etc/xdg/autostart/applauncherd.desktop + to automatically start applauncherd in UI session. + +--- + CMakeLists.txt | 4 ++++ + meego/applauncherd.desktop | 4 ++++ + 2 files changed, 8 insertions(+), 0 deletions(-) + create mode 100644 meego/applauncherd.desktop + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cac933a..eb96da3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,3 +81,7 @@ install(FILES data/pkgconfig/meegotouch-boostable.pc DESTINATION /usr/lib/pkgcon + # Install the qmake config feature file + install(FILES data/mkspecs/features/meegotouch-boostable.prf DESTINATION /usr/share/qt4/mkspecs/features) + ++if ($ENV{MEEGO}) ++ install(FILES meego/applauncherd.desktop DESTINATION /etc/xdg/autostart) ++endif ($ENV{MEEGO}) ++ +diff --git a/meego/applauncherd.desktop b/meego/applauncherd.desktop +new file mode 100644 +index 0000000..cf1348d +--- /dev/null ++++ b/meego/applauncherd.desktop +@@ -0,0 +1,4 @@ ++[Desktop Entry] ++Exec=/usr/bin/applauncherd ++X-Moblin-Priority=High ++OnlyShowIn=X-MEEGO-HS; +-- +1.7.0.4 + diff --git a/meego/0.12.1/create-tarball.sh b/meego/0.12.1/create-tarball.sh new file mode 100644 index 0000000..6c77f42 --- /dev/null +++ b/meego/0.12.1/create-tarball.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if test -n "$1" +then + git archive --format tar --remote=$1 --output=meegotouch-applauncherd-0.12.1.tar --prefix meegotouch-applauncherd-0.12.1/ released/0.12.1 + bzip2 meegotouch-applauncherd-0.12.1.tar +else + echo "Usage: create-tarball.sh " + echo " where is suitable for git archive --remote=" +fi diff --git a/meego/0.12.1/meegotouch-applauncherd.changes b/meego/0.12.1/meegotouch-applauncherd.changes new file mode 100644 index 0000000..f761136 --- /dev/null +++ b/meego/0.12.1/meegotouch-applauncherd.changes @@ -0,0 +1,11 @@ +* Thu Sep 2 2010 Pertti Kellomäki - 0.12.1 +- Updated to version 0.12.1. +- Packaged tests and test scripts as subpackages, reorganized testing + stuff to satisfy rpmlint. +- Included a .desktop file which kicks off applauncherd in a UI session. + +* Wed Aug 25 2010 Pertti Kellomäki - 0.10.3 +- Updated to version 0.10.3. + +* Wed Jul 14 2010 Pertti Kellomäki - 0.8.0 +- Initial packaging. diff --git a/meego/0.12.1/meegotouch-applauncherd.spec b/meego/0.12.1/meegotouch-applauncherd.spec new file mode 100644 index 0000000..693b78c --- /dev/null +++ b/meego/0.12.1/meegotouch-applauncherd.spec @@ -0,0 +1,178 @@ +# +# Do not Edit! Generated by: +# spectacle version 0.18 +# +# >> macros +# << macros + +Name: meegotouch-applauncherd +Summary: Application launcher for fast startup +Version: 0.12.1 +Release: 1 +Group: System/Daemons +License: LGPLv2+ +URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd +Source0: %{name}-%{version}.tar.bz2 +Source100: meegotouch-applauncherd.yaml +Patch0: 0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch +Patch1: 0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(meegotouch) +BuildRequires: cmake + + +%description +Application invoker and launcher daemon that speed up +application startup time. + + + +%package devel +Summary: Development files for launchable applications +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for creating applications that can be launched +using meegotouch-applauncherd. + + +%package testapps +Summary: Test applications for launchable applications +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description testapps +Test applications used for testing meegotouch-applauncherd. + + +%package tests +Summary: Test scripts for launchable applications +Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: %{name}-testapps = %{version}-%{release} + +%description tests +Test scripts used for testing meegotouch-applauncherd. + + + +%prep +%setup -q -n %{name}-%{version} + +# 0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch +%patch0 -p1 +# 0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch +%patch1 -p1 +# >> setup +# << setup + +%build +# >> build pre +export BUILD_TESTS=1 +export MEEGO=1 +# << build pre + +%configure --disable-static +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +# rpmlint complains about installing binaries in /usr/share, so +# move them elsewhere and leave a symlink in place. +mv %{buildroot}/usr/share/applauncherd-tests %{buildroot}/usr/lib +(cd %{buildroot}/usr/share; ln -s ../lib/applauncherd-tests) +# << install post + + + + + + + + + + + + + + + +%files +%defattr(-,root,root,-) +%{_bindir}/invoker +%{_bindir}/applauncherd.bin +%{_bindir}/applauncherd +%config %{_sysconfdir}/xdg/autostart/applauncherd.desktop +# >> files +# << files + + +%files devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/meegotouch-boostable.pc +%doc %{_docdir}/applauncherd/README +%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf +# >> files devel +# << files devel + +%files testapps +%defattr(-,root,root,-) +%{_bindir}/fala_ft_hello +%{_bindir}/fala_status.launch +%{_bindir}/fala_ft_hello1 +%{_bindir}/fala_ft_hello2 +%{_bindir}/fala_ft_hello.launch +%{_bindir}/fala_ft_hello1.launch +%{_bindir}/fala_ft_hello2.launch +%{_bindir}/fala_ft_creds1 +%{_bindir}/fala_ft_creds1.launch +%{_bindir}/fala_ft_creds2 +%{_bindir}/fala_ft_creds2.launch +%{_bindir}/fala_testapp +%{_bindir}/fala_ft_themetest.launch +%{_bindir}/fala_ft_themetest +%{_datadir}/themes/base/meegotouch/fala_ft_themetest/svg/baa.svg +%{_datadir}/dbus-1/services/com.nokia.fala_testapp.service +# >> files testapps +# << files testapps + +%files tests +%defattr(-,root,root,-) +%{_datadir}/applauncherd-art-tests/tests.xml +%{_datadir}/applauncherd-bug-tests/tests.xml +%{_datadir}/applauncherd-functional-tests/tests.xml +%{_datadir}/applauncherd-performance-tests/tests.xml +%{_datadir}/applauncherd-tests +%{_libdir}/applauncherd-tests/tests.xml +%{_libdir}/applauncherd-tests/ut_booster +%{_libdir}/applauncherd-tests/ut_connection +%{_libdir}/applauncherd-tests/ut_daemon +%{_libdir}/applauncherd-tests/ut_mbooster +%{_libdir}/applauncherd-tests/ut_qtbooster +%{_datadir}/applauncherd-testscripts/check_pipes.py +%{_datadir}/applauncherd-testscripts/check_pipes.pyc +%{_datadir}/applauncherd-testscripts/check_pipes.pyo +%{_datadir}/applauncherd-testscripts/fala_sf.py +%{_datadir}/applauncherd-testscripts/fala_sf.pyc +%{_datadir}/applauncherd-testscripts/fala_sf.pyo +%{_datadir}/applauncherd-testscripts/fala_sf.sh +%{_datadir}/applauncherd-testscripts/tc_theming.rb +%{_datadir}/applauncherd-testscripts/test-func-launcher.py +%{_datadir}/applauncherd-testscripts/test-func-launcher.pyc +%{_datadir}/applauncherd-testscripts/test-func-launcher.pyo +%{_datadir}/applauncherd-testscripts/test-perf-mbooster.py +%{_datadir}/applauncherd-testscripts/test-perf-mbooster.pyc +%{_datadir}/applauncherd-testscripts/test-perf-mbooster.pyo +%{_datadir}/applauncherd-testscripts/ts_prestartapp.rb +%{_datadir}/themes/base/meegotouch/fala_ft_themetest/style/fala_ft_themetest.css +# >> files tests +# << files tests + diff --git a/meego/0.12.1/meegotouch-applauncherd.yaml b/meego/0.12.1/meegotouch-applauncherd.yaml new file mode 100644 index 0000000..85e74d4 --- /dev/null +++ b/meego/0.12.1/meegotouch-applauncherd.yaml @@ -0,0 +1,94 @@ +Name: meegotouch-applauncherd +Summary: Application launcher for fast startup +Version: 0.12.1 +Release: 1 +Group: System/Daemons +License: LGPLv2+ +URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - "0001-Changes-use-usr-bin-ruby-instead-of-usr-bin-ruby1.8-.patch" + - "0002-Changes-In-MeeGo-install-file-etc-xdg-autostart-appl.patch" +Description: | + Application invoker and launcher daemon that speed up + application startup time. +PkgConfigBR: + - QtCore + - meegotouch +PkgBR: + - cmake +Builder: make +SubPackages: + - Name: devel + Group: Development/Tools + Summary: Development files for launchable applications + Description: | + Development files for creating applications that can be launched + using meegotouch-applauncherd. + Files: + - "%{_libdir}/pkgconfig/meegotouch-boostable.pc" + - "%doc %{_docdir}/applauncherd/README" + - "%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf" + - Name: testapps + Group: Development/Tools + Summary: Test applications for launchable applications + Description: | + Test applications used for testing meegotouch-applauncherd. + Files: + - "%{_bindir}/fala_ft_hello" + - "%{_bindir}/fala_status.launch" + - "%{_bindir}/fala_ft_hello1" + - "%{_bindir}/fala_ft_hello2" + - "%{_bindir}/fala_ft_hello.launch" + - "%{_bindir}/fala_ft_hello1.launch" + - "%{_bindir}/fala_ft_hello2.launch" + - "%{_bindir}/fala_ft_creds1" + - "%{_bindir}/fala_ft_creds1.launch" + - "%{_bindir}/fala_ft_creds2" + - "%{_bindir}/fala_ft_creds2.launch" + - "%{_bindir}/fala_testapp" + - "%{_bindir}/fala_ft_themetest.launch" + - "%{_bindir}/fala_ft_themetest" + - "%{_datadir}/themes/base/meegotouch/fala_ft_themetest/svg/baa.svg" + - "%{_datadir}/dbus-1/services/com.nokia.fala_testapp.service" + - Name: tests + Group: Development/Tools + Summary: Test scripts for launchable applications + Description: | + Test scripts used for testing meegotouch-applauncherd. + Requires: "%{name}-testapps = %{version}-%{release}" + Files: + - "%{_datadir}/applauncherd-art-tests/tests.xml" + - "%{_datadir}/applauncherd-bug-tests/tests.xml" + - "%{_datadir}/applauncherd-functional-tests/tests.xml" + - "%{_datadir}/applauncherd-performance-tests/tests.xml" + - "%{_datadir}/applauncherd-tests" + - "%{_libdir}/applauncherd-tests/tests.xml" + - "%{_libdir}/applauncherd-tests/ut_booster" + - "%{_libdir}/applauncherd-tests/ut_connection" + - "%{_libdir}/applauncherd-tests/ut_daemon" + - "%{_libdir}/applauncherd-tests/ut_mbooster" + - "%{_libdir}/applauncherd-tests/ut_qtbooster" + - "%{_datadir}/applauncherd-testscripts/check_pipes.py" + - "%{_datadir}/applauncherd-testscripts/check_pipes.pyc" + - "%{_datadir}/applauncherd-testscripts/check_pipes.pyo" + - "%{_datadir}/applauncherd-testscripts/fala_sf.py" + - "%{_datadir}/applauncherd-testscripts/fala_sf.pyc" + - "%{_datadir}/applauncherd-testscripts/fala_sf.pyo" + - "%{_datadir}/applauncherd-testscripts/fala_sf.sh" + - "%{_datadir}/applauncherd-testscripts/tc_theming.rb" + - "%{_datadir}/applauncherd-testscripts/test-func-launcher.py" + - "%{_datadir}/applauncherd-testscripts/test-func-launcher.pyc" + - "%{_datadir}/applauncherd-testscripts/test-func-launcher.pyo" + - "%{_datadir}/applauncherd-testscripts/test-perf-mbooster.py" + - "%{_datadir}/applauncherd-testscripts/test-perf-mbooster.pyc" + - "%{_datadir}/applauncherd-testscripts/test-perf-mbooster.pyo" + - "%{_datadir}/applauncherd-testscripts/ts_prestartapp.rb" + - "%{_datadir}/themes/base/meegotouch/fala_ft_themetest/style/fala_ft_themetest.css" + +Files: + - "%{_bindir}/invoker" + - "%{_bindir}/applauncherd.bin" + - "%{_bindir}/applauncherd" + - "%config %{_sysconfdir}/xdg/autostart/applauncherd.desktop" diff --git a/meego/README b/meego/README index 137a8a1..2879cff 100644 --- a/meego/README +++ b/meego/README @@ -1,4 +1,5 @@ -These files are for packaging applauncherd for MeeGo. In order to generate -the RPM .spec file you need to have the spectacle package installed, -and then run "specify ./meegotouch-applauncherd.yaml". Remember to update -meegotouch-applauncherd.changes before you submit a package. +This directory contains the packaging materials needed for packaging +applauncherd for MeeGo. The files needed for packaging specific +releases are contained in the corresponding directories. The script +create-tarball.sh pulls a tar ball from a git repository, and the +rest of the files are ready to be submitted to build.meego.com. diff --git a/meego/applauncherd.desktop b/meego/applauncherd.desktop new file mode 100644 index 0000000..cf1348d --- /dev/null +++ b/meego/applauncherd.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Exec=/usr/bin/applauncherd +X-Moblin-Priority=High +OnlyShowIn=X-MEEGO-HS; diff --git a/meego/meegotouch-applauncherd.changes b/meego/meegotouch-applauncherd.changes deleted file mode 100644 index 113535d..0000000 --- a/meego/meegotouch-applauncherd.changes +++ /dev/null @@ -1,5 +0,0 @@ -* Wed Aug 25 2010 Pertti Kellomäki - 0.10.3 -- Updated to version 0.10.3. - -* Wed Jul 14 2010 Pertti Kellomäki - 0.8.0 -- Initial packaging. diff --git a/meego/meegotouch-applauncherd.yaml b/meego/meegotouch-applauncherd.yaml deleted file mode 100644 index 7e76e99..0000000 --- a/meego/meegotouch-applauncherd.yaml +++ /dev/null @@ -1,33 +0,0 @@ -Name: meegotouch-applauncherd -Summary: Application launcher for fast startup -Version: 0.10.3 -Release: 1 -Group: System/Daemons -License: LGPLv2+ -URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd -Sources: - - "%{name}-%{version}.tar.bz2" -Description: | - Application invoker and launcher daemon that speed up - application startup time. -PkgConfigBR: - - QtCore - - meegotouch -PkgBR: - - cmake -Builder: make -SubPackages: - - Name: devel - Group: Development/Tools - Summary: Development files for launchable applications - Description: | - Development files for creating applications that can be launched - using meegotouch-applauncherd. - Files: - - "%{_libdir}/pkgconfig/meegotouch-boostable.pc" - - "%doc %{_docdir}/applauncherd/README" - - "%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf" -Files: - - "%{_bindir}/invoker" - - "%{_bindir}/applauncherd.bin" - - "%{_bindir}/applauncherd"