From 54b2ebcbf00644a7b640fe19d5c267195ec4665a Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Tue, 14 Oct 2014 13:56:44 +0200 Subject: [PATCH] Update spec files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I9237ad0bf15d25603876d263522a01e76ce3e982 Signed-off-by: Kévin THIERRY --- .../packaging/Modello-Homescreen.spec | 19 ++++++---- .../packaging/Modello-Installer.spec | 12 +++---- .../packaging/audio-session-manager.spec | 21 ++++++------ .../crosswalk/packaging/crosswalk.spec | 2 +- .../packaging/ico-uxf-homescreen.spec | 40 ++++++++++++---------- .../message-port-dbus/packaging/message-port.spec | 25 ++++++-------- .../meta-generic/packaging/meta-generic.spec | 15 +++++++- .../systemd/packaging/systemd.spec | 1 + 8 files changed, 76 insertions(+), 59 deletions(-) diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec index bbfa863..b5f3292 100644 --- a/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec +++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec @@ -8,10 +8,11 @@ URL: http://www.tizen.org Source0: %{name}-%{version}.tar.bz2 Source1001: Modello-Homescreen.manifest -BuildRequires: zip -Requires: Modello-Common -BuildArchitectures: noarch +BuildRequires: zip +BuildRequires: pkgconfig(libtzplatform-config) +Requires: Modello-Common +BuildArchitectures: noarch %description A proof of concept pure html5 UI files @@ -21,10 +22,14 @@ A proof of concept pure html5 UI files cp %{SOURCE1001} . %build -%__make wgtPkg +#empty %install - %make_install + mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL} + mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons + zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml manifest.json css Homescreen_icon.png index.html js + install -m 0644 Homescreen_icon.png %{buildroot}%{_datadir}/Modello/Common/icons + mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_unitdir_user}/weston.target.wants/ install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir} @@ -34,8 +39,8 @@ cp %{SOURCE1001} . %files %defattr(-,root,root,-) -/opt/usr/apps/.preinstallWidgets/%{name}.wgt -/opt/usr/apps/_common/icons/Homescreen_icon.png +%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt +%{_datadir}/Modello/Common/icons/Homescreen_icon.png %{_unitdir_user}/Modello_Homescreen.service %{_unitdir_user}/Modello_Homescreen-launchpad-ready.path %{_bindir}/modello_launcher.sh diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec index 3eed87b..8ba50d3 100644 --- a/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec +++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec @@ -56,9 +56,9 @@ export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket" for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*") do -#XWalk requires you not be root to install files - echo "Installing $list" - su %{MODELLO_INSTALL_USER} -c "xwalkctl -i $list" + #XWalk requires you not be root to install files + echo "Installing $list" + su %{MODELLO_INSTALL_USER} -c "pkgcmd -q -i -t wgt -p $list" done for list2 in $(ls -d $TZ_SYS_HOME/%{MODELLO_INSTALL_USER}/.config/xwalk-service/applications/*/) @@ -75,10 +75,10 @@ source %{_sysconfdir}/tizen-platform.conf export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket" -for list3 in $(su %{MODELLO_INSTALL_USER} -c "xwalkctl" | grep Modello | cut -c 1-32) +for list3 in $(su %{MODELLO_INSTALL_USER} -c "xwalkctl" | grep Modello | cut -c 1-10) do - echo "Uninstalling $list3" - su %{MODELLO_INSTALL_USER} -c "xwalkctl -u $list3" + echo "Uninstalling $list3" + su %{MODELLO_INSTALL_USER} -c "pkgcmd -q -u -n $list3" done %post wrt diff --git a/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec b/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec index d3259e9..1453c77 100644 --- a/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec +++ b/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec @@ -5,17 +5,16 @@ Release: 0 Group: Multimedia/Service License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: audio-session-manager.manifest -Requires(post): /sbin/ldconfig -Requires(post): /usr/bin/vconftool -Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(mm-common) -BuildRequires: pkgconfig(sysman) -BuildRequires: pkgconfig(vconf) -BuildRequires: pkgconfig(avsysaudio) -BuildRequires: pkgconfig(security-server) +Source1001: audio-session-manager.manifest +Requires(post): /sbin/ldconfig +Requires(post): /usr/bin/vconftool +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(mm-common) +BuildRequires: pkgconfig(sysman) +BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(avsysaudio) +BuildRequires: pkgconfig(security-server) %description Audio Session Manager package. diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec index 2f92108..55cb762 100644 --- a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec +++ b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec @@ -274,7 +274,7 @@ ln -sf %{_libdir}/xwalk/xwalk_backend_wrapper.sh /etc/package-manager/backend/xp ln -sf %{_libdir}/xwalk/xwalk_backend_wrapper.sh /etc/package-manager/backend/wgt %preun -if [ $1 -eq 1 ] ; then +if [ $1 -eq 0 ] ; then # don't remove if we are upgrade the rpm package [ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so [ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so diff --git a/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec b/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec index be7cb47..0511079 100644 --- a/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec +++ b/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec @@ -5,6 +5,7 @@ Release: 0 Group: Automotive/ICO Homescreen License: Apache-2.0 Source0: %{name}-%{version}.tar.bz2 +Source1001: %{name}.manifest BuildRequires: pkgconfig(wayland-client) >= 1.4 BuildRequires: ico-uxf-weston-plugin-devel >= 0.9.21 @@ -37,7 +38,8 @@ BuildRequires: weston-ivi-shell-devel BuildRequires: genivi-shell BuildRequires: genivi-shell-devel BuildRequires: ico-uxf-utilities-devel >= 0.9.07 -BuildRequires: libtzplatform-config-devel +BuildRequires: pkgconfig(libtzplatform-config) +BuildRequires: fdupes Requires: weston >= 1.4 Requires: weston-ivi-shell Requires: genivi-shell @@ -46,12 +48,12 @@ Requires: ico-uxf-utilities >= 0.9.07 Requires: system-controller %description -Sample homescreen application. +This package provides the sample homescreen application. %package system-controller Summary: System controller for ICO HomeScreen -Group: Automotive / ICO Homescreen +Group: Automotive/ICO Homescreen Requires: %{name} = %{version}-%{release} Requires: weston >= 1.4 Requires: weston-ivi-shell @@ -68,7 +70,7 @@ requires. %package system-controller-devel Summary: Development files for %{name} -Group: Automotive / ICO Homescreen +Group: Automotive/ICO Homescreen Requires: %{name} = %{version}-%{release} Requires: capi-base-common-devel Requires: pkgconfig(eina) @@ -84,6 +86,7 @@ Development files for application that communicate homescreen. %prep %setup -q -n %{name}-%{version} +cp %{SOURCE1001} . mkdir -p weston cp -av %{TZ_SYS_SHARE}/genivi-shell/protocol/*.xml weston/ @@ -114,11 +117,13 @@ cp tool/notification/ico_dump_notification %{buildroot}%{_bindir} cp tool/notification/ico_send_notification %{buildroot}%{_bindir} cp tool/notification/ico_send_notification2 %{buildroot}%{_bindir} +%fdupes %{buildroot} + %post /sbin/ldconfig # Update the app database. -%{_bindir}/pkg_initdb -%{_bindir}/ail_initdb +pkg_initdb +ail_initdb %postun /sbin/ldconfig @@ -126,12 +131,12 @@ rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.homescreen.desktop rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.statusbar.desktop rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.onscreen.desktop rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.system-controller.desktop -%{_bindir}/pkg_initdb -%{_bindir}/ail_initdb +pkg_initdb +ail_initdb %files -%manifest %{name}.manifest %defattr(-,root,root,-) +%manifest %{name}.manifest %{TZ_SYS_RW_APP}/org.tizen.ico.homescreen %{TZ_SYS_RW_APP}/org.tizen.ico.statusbar %{TZ_SYS_RW_APP}/org.tizen.ico.onscreen @@ -149,22 +154,22 @@ rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.system-controller.desktop %{_datadir}/icons/default/small/org.tizen.ico.homescreen.png %{_datadir}/icons/default/small/org.tizen.ico.statusbar.png %{_datadir}/icons/default/small/org.tizen.ico.onscreen.png -/usr/apps/org.tizen.ico.system-controller/res/config +%TZ_SYS_RW_APP/org.tizen.ico.system-controller/res/config %files system-controller -%manifest %{name}.manifest %defattr(-,root,root,-) -/usr/share/packages/org.tizen.ico.system-controller.xml -/usr/lib/systemd/user/ico-uxf-wait-launchpad-ready.path -/usr/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path -/usr/lib/systemd/user/ico-system-controller.service -/usr/apps/org.tizen.ico.system-controller/bin +%manifest %{name}.manifest +%{_datadir}/packages/org.tizen.ico.system-controller.xml +%{_unitdir_user}/ico-uxf-wait-launchpad-ready.path +%{_unitdir_user}/weston.target.wants/ico-uxf-wait-launchpad-ready.path +%{_unitdir_user}/ico-system-controller.service +%TZ_SYS_RW_APP/org.tizen.ico.system-controller/bin %attr(644,app,app) /home/app/ico/defaultApps.info %attr(755,app,app) /home/app/ico %files system-controller-devel -%manifest %{name}.manifest %defattr(-,root,root,-) +%manifest %{name}.manifest %{_includedir}/ico-appfw/ico_syc_application.h %{_includedir}/ico-appfw/ico_syc_appresctl.h %{_includedir}/ico-appfw/ico_syc_common.h @@ -185,4 +190,3 @@ rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.system-controller.desktop %{_includedir}/ico-state-machine/CicoStateCore.h %{_includedir}/ico-state-machine/CicoStateMachine.h %{_includedir}/ico-state-machine/CicoStateMachineCreator.h - diff --git a/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec b/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec index 81b64f1..be90a97 100644 --- a/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec +++ b/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec @@ -1,11 +1,8 @@ - %define build_tests 1 %define use_session_bus 0 -%define systemddir /lib/systemd %define daemon_user messageport %define daemon_group messageport - Name: message-port Summary: Message port daemon Version: 1.0.3 @@ -61,7 +58,6 @@ Unit tests for messageport implementation. %endif - %prep %setup -q -n %{name}-%{version} cp -a %{SOURCE1} . @@ -83,25 +79,24 @@ mkdir -p m4 > /dev/null %install %make_install -mkdir -p ${RPM_BUILD_ROOT}%{systemddir}/system -cp messageportd.service $RPM_BUILD_ROOT%{systemddir}/system +mkdir -p %{buildroot}%{_unitdir} +cp messageportd.service %{buildroot}%{_unitdir} %post -getent group %{daemon_group} >/dev/null || %{_sbindir}/groupadd -r -o %{daemon_group} -getent passwd %{daemon_user} >/dev/null || %{_sbindir}/useradd -r -g %{daemon_group} -s /bin/false -d /run/%{daemon_user} -c "Message Port daemon" %{daemon_user} +getent group %{daemon_group} >/dev/null || groupadd -r -o %{daemon_group} +getent passwd %{daemon_user} >/dev/null || useradd -r -g %{daemon_group} -s /bin/false -d /run/%{daemon_user} -c "Message Port daemon" %{daemon_user} -/bin/systemctl enable messageportd.service +systemctl enable messageportd.service %postun -/bin/systemctl disable messageportd.service +systemctl disable messageportd.service %post -n lib%{name} -/sbin/ldconfig +ldconfig %postun -n lib%{name} -/sbin/ldconfig - +ldconfig # daemon: message-port %files -n %{name} @@ -111,7 +106,7 @@ getent passwd %{daemon_user} >/dev/null || %{_sbindir}/useradd -r -g %{daemon_gr %{_datadir}/dbus-1/services/org.tizen.messageport.service %manifest %{name}.manifest %endif -%{systemddir}/system/messageportd.service +%{_unitdir}/messageportd.service %license COPYING.LIB # libmessage-port @@ -119,7 +114,7 @@ getent passwd %{daemon_user} >/dev/null || %{_sbindir}/useradd -r -g %{daemon_gr %defattr(-,root,root,-) %manifest %{name}.manifest %defattr(-,root,root,-) -%doc AUTHORS COPYING.LIB README +%doc AUTHORS COPYING.LIB %{_libdir}/lib%{name}.so* #libmessage-port-devel diff --git a/proto-meta-Tizen_generic/specfile-initial/meta-generic/packaging/meta-generic.spec b/proto-meta-Tizen_generic/specfile-initial/meta-generic/packaging/meta-generic.spec index be1ecda..5d114a7 100644 --- a/proto-meta-Tizen_generic/specfile-initial/meta-generic/packaging/meta-generic.spec +++ b/proto-meta-Tizen_generic/specfile-initial/meta-generic/packaging/meta-generic.spec @@ -1,16 +1,25 @@ Summary: Tizen Package Groups and Images Configurations Name: meta-generic Version: 0 -Release: 1 +Release: 0 License: GPL-2.0 Group: Base/Configuration URL: http://www.tizen.org Source: %{name}-%{version}.tar.bz2 Source1001: meta-generic.manifest +BuildArch: noarch %description Tizen Package Groups and Image Configurations for Base OS + +%package adaptation +Summary: Hardware adataption configuration files +BuildArch: noarch + +%description adaptation +Hardware adaptation tweaks to ship inside image + %prep %setup -q cp %{SOURCE1001} . @@ -27,3 +36,7 @@ make %attr(644,-,-) %{_datadir}/package-groups/generic/*.yaml %{_datadir}/image-configurations/generic/scripts + +%files adaptation +%{_sysconfdir}/profile.d/generic-adaptation.sh + diff --git a/proto-meta-Tizen_generic/specfile-initial/systemd/packaging/systemd.spec b/proto-meta-Tizen_generic/specfile-initial/systemd/packaging/systemd.spec index 4f63d9c..a1cc2fc 100644 --- a/proto-meta-Tizen_generic/specfile-initial/systemd/packaging/systemd.spec +++ b/proto-meta-Tizen_generic/specfile-initial/systemd/packaging/systemd.spec @@ -31,6 +31,7 @@ Requires: filesystem Requires: hwdata Requires(post): coreutils Requires(post): gawk +Requires(post): /usr/bin/chsmack Requires(pre): coreutils Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/groupadd -- 2.7.4