From 52d48438acf369b26909b4b0ca8ecb1ae4950e3a Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 1 Jul 2014 18:12:33 +0200 Subject: [PATCH] Update init spec files Change-Id: I91fbb504969bb0c1de2766656d08b353881ebda5 --- proto-meta-Tizen_generic/.spec2yoctorc | 61 ++++- .../specfile-initial/aul-1/packaging/aul.spec | 1 + .../bluetooth-frwk/packaging/bluetooth-frwk.spec | 31 +-- .../crosswalk/packaging/crosswalk.spec | 4 +- .../packaging/download-provider.spec | 172 +++++--------- .../favorites/packaging/capi-web-favorites.spec | 83 +------ .../packaging/libmedia-service.spec | 1 + .../packaging/libmedia-thumbnail.spec | 1 + .../libmm-utility/packaging/libmm-utility.spec | 1 + .../packaging/capi-content-media-content.spec | 2 +- .../media-server/packaging/media-server.spec | 27 ++- .../syspopup/packaging/syspopup.spec | 19 +- .../packaging/capi-system-system-settings.spec | 29 ++- .../packaging/tizen-extensions-crosswalk.spec | 246 +++++++++++++++++++++ .../packaging/capi-web-url-download.spec | 22 +- .../specfile-initial/vconf/packaging/vconf.spec | 5 +- tools/spec2yocto.py | 15 +- 17 files changed, 467 insertions(+), 253 deletions(-) mode change 100755 => 100644 proto-meta-Tizen_generic/specfile-initial/syspopup/packaging/syspopup.spec create mode 100644 proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec mode change 100755 => 100644 proto-meta-Tizen_generic/specfile-initial/url-download/packaging/capi-web-url-download.spec diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc index 5c3ebb7..34801ce 100644 --- a/proto-meta-Tizen_generic/.spec2yoctorc +++ b/proto-meta-Tizen_generic/.spec2yoctorc @@ -27,7 +27,7 @@ default_git_src=review.tizen.org priority=1 [whitelist_tizen_common] -list=smack, rpm, uthash, lua, weston-common, fdupes, doxygen, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, com-core, libtapi, libtapi-legacy, alsa-scenario-0.2, systemd, hwdata, user-session-units, systemd, meta, pam, desktop-skin, default-ac-domains, sensor, tizen-extensions-crosswalk +list=smack, rpm, uthash, lua, weston-common, fdupes, doxygen, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, com-core, libtapi, libtapi-legacy, alsa-scenario-0.2, systemd, hwdata, user-session-units, systemd, meta, pam, desktop-skin, default-ac-domains, sensor, tizen-extensions-crosswalk, app-manager, package-manager, bluetooth, connection, device, power, runtime-info, system-settings, favorites, url-download, media-content, message-port, chromium, bluetooth-frwk, devman, libmedia-service, libmedia-thumbnail, download-provider, media-server, libmm-utility, libmm-fileinfo, libwifi-direct, libdevice-node, tethering, syspopup, status,libnet-client, libdevice-node, drm-client, bluetooth-tools [substitute] pkgconfig(zlib)=zlib-devel @@ -44,6 +44,7 @@ pkg-config=pkgconfig perl-XML-Parser=libxml-parser-perl pwdutils=shadow + [runtime_tizen_common_blacklist] list= @@ -99,7 +100,7 @@ cairo=pkgconfig(cairo), pkgconfig(cairo-egl), pkgconfig(cairo-glesv2) common=pkgconfig(capi-base-common) dbus=pkgconfig(dbus-glib-1), pkgconfig(dbus-1) dlog=pkgconfig(dlog) -ecore=pkgconfig(ecore-input), pkgconfig(ecore-wayland), pkgconfig(ecore) +ecore=pkgconfig(ecore-input), pkgconfig(ecore-wayland), pkgconfig(ecore), pkgconfig(ecore-file) eglibc=glibc-devel, pkgconfig(gobject-2.0), pkgconfig(gio-2.0), /sbin/ldconfig, pkgconfig(gmodule-2.0), /usr/bin/getent elfutils=libelf-devel expat=expat-devel @@ -110,7 +111,6 @@ gcc=gcc-c++ heynoti=pkgconfig(heynoti) icu=pkgconfig(icu-i18n) iniparser=pkgconfig(iniparser) -jpeg=libjpeg-devel libcap=libcap-devel, pkgconfig(libcap) libdevice-node=pkgconfig(devman_plugin) libdrm=pkgconfig(libdrm) @@ -125,7 +125,6 @@ libmm-sound=pkgconfig(mm-sound) libmm-ta=pkgconfig(mm-ta) libpam=pam-devel libpng=pkgconfig(libpng) -libprivilege-control=pkgconfig(libprivilege-control) librua=pkgconfig(rua) libslp-db-util=pkgconfig(db-util) libslp-pm=pkgconfig(pmapi) @@ -150,15 +149,12 @@ pixman=pkgconfig(pixman-1) pkgmgr-info=pkgconfig(pkgmgr-info), pkgconfig(pkgmgr-parser) privacy-manager=pkgconfig(privacy-manager-client) poppler=pkgconfig(poppler-glib) -poppler=pkgconfig(poppler-glib) popt=pkgconfig(popt), popt-devel pulseaudio=pkgconfig(libpulse) shadow=/usr/sbin/groupadd python=python-devel, pkgconfig(python) readline=readline-devel security-server=pkgconfig(security-server) -slp-pkgmgr=pkgconfig(pkgmgr-installer) -smack=pkgconfig(libsmack) sound-manager=pkgconfig(capi-media-sound-manager) sqlite3=pkgconfig(sqlite3), /usr/bin/sqlite3 system-info=pkgconfig(capi-system-info) @@ -174,7 +170,7 @@ xdgmime=pkgconfig(xdgmime), xdgmime-devel xz=xz-devel, pkgconfig(liblzma) zlib=zlib-devel bundle=pkgconfig(bundle) -slp-pkgmgr=pkgconfig(pkgmgr-installer) +slp-pkgmgr=pkgconfig(pkgmgr-installer), pkgconfig(pkgmgr) app-core=pkgconfig(appcore-efl),pkgconfig(appcore-common) elementary=pkgconfig(elementary) libsf-common=pkgconfig(sf_common) @@ -187,13 +183,56 @@ libtapi-legacy=pkgconfig(tapi) libtapi=pkgconfig(tapi-3.0) libsoup-2.4=pkgconfig(libsoup-2.4) json-glib=pkgconfig(json-glib-1.0) -glib-2.0= pkgconfig(glib-2.0), pkgconfig(gmodule-2.0) +glib-2.0= pkgconfig(glib-2.0), pkgconfig(gmodule-2.0), pkgconfig(gthread-2.0) libgcrypt=libgcrypt-devel util-linux=libblkid-devel kmod=libkmod-devel smack=smack-devel, pkgconfig(libsmack) db=db4-devel coreutils=/usr/bin/install -bluez=pkgconfig(bluez) +bluez4=pkgconfig(bluez) sbc=pkgconfig(sbc) -binutils=binutils-gold \ No newline at end of file +binutils=binutils-gold +app-manager=pkgconfig(capi-appfw-app-manager) +package-manager=pkgconfig(capi-appfw-package-manager) +bluetooth=pkgconfig(capi-network-bluetooth) +connection=pkgconfig(capi-network-connection) +device=pkgconfig(capi-system-device) +power=pkgconfig(capi-system-power) +runtime-info=pkgconfig(capi-system-runtime-info) +sensor=pkgconfig(capi-system-sensor) +system-settings=pkgconfig(capi-system-system-settings) +favorites=pkgconfig(capi-web-favorites) +url-download=pkgconfig(capi-web-url-download) +media-content=pkgconfig(capi-content-media-content) +evas=pkgconfig(evas) +message-port=pkgconfig(message-port) +chromium=pkgconfig(chromium) +bluetooth-frwk=pkgconfig(bluetooth-api) +devman=pkgconfig(devman) +libmedia-service=pkgconfig(libmedia-service) +libmedia-thumbnail=pkgconfig(media-thumbnail) +download-provider=pkgconfig(download-provider-interface) +media-server=pkgconfig(libmedia-utils) +libmm-utility=pkgconfig(mmutil-imgp), pkgconfig(mmutil-jpeg) +libmm-fileinfo=pkgconfig(mm-fileinfo) +drm-client=pkgconfig(drm-client) +libav=pkgconfig(libavcodec), pkgconfig(libavutil), pkgconfig(libswscale), pkgconfig(libavformat) +libwifi-direct=pkgconfig(wifi-direct) +libdevice-node=pkgconfig(device-node) +tethering=pkgconfig(capi-network-tethering) +syspopup=pkgconfig(syspopup-caller) +status=pkgconfig(status),pkgconfig(status-monitor) +libnet-client=pkgconfig(network) +libdevice-node=pkgconfig(device-node), pkgconfig(devman_plugin) +libprivilege-control=libprivilege-control-conf,pkgconfig(libprivilege-control) +tizen-platform-wrapper=tizen-platform-wrapper +libjpeg-turbo=libjpeg-turbo-devel,libjpeg-devel +gettext=gettext-devel + + + + + + + diff --git a/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec b/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec index ed7e741..f3264a8 100644 --- a/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec +++ b/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec @@ -59,6 +59,7 @@ Application utility library (devel) %prep %setup -q +sed -i 's|TZ_SYS_DB|%{TZ_SYS_DB}|g' %{SOURCE1001} cp %{SOURCE1001} . %build diff --git a/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec b/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec index 99f6f64..0534829 100644 --- a/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec +++ b/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec @@ -1,6 +1,5 @@ %bcond_with bluetooth_frwk_libnotify %bcond_with bluetooth_frwk_libnotification -%bcond_with multi_user %bcond_with x Name: bluetooth-frwk @@ -40,6 +39,7 @@ BuildRequires: pkgconfig(alarm-service) BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(security-server) BuildRequires: cmake +BuildRequires: pkgconfig(libtzplatform-config) Requires(post): vconf Requires(post): /sbin/ldconfig @@ -90,11 +90,7 @@ export CFLAGS+=" -fpie" export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie" %endif %cmake . \ -%if %{with multi_user} - -DMULTI_USER_SUPPORT=On \ -%else - -DMULTI_USER_SUPPORT=Off \ -%endif +-DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP \ %if %{with bluetooth_frwk_libnotify} -DLIBNOTIFY_SUPPORT=On \ %else @@ -111,14 +107,10 @@ make %install rm -rf %{buildroot} %make_install -%if !%{with multi_user} - mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/ - mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/ - ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service - ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service -%else - mv %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-service_user.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-service.conf -%endif +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/ +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/ +ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service +ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service mkdir -p %{buildroot}%{_unitdir_user} mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants @@ -159,12 +151,11 @@ vconftool set -tf int memory/bluetooth/btsco "0" -g 6520 -i %files service %manifest %{name}.manifest %defattr(-, root, root) -%if !%{with multi_user} - %{_datadir}/dbus-1/system-services/org.projectx.bt.service - %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service - %{_sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service - %{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service -%endif +%{_datadir}/dbus-1/system-services/org.projectx.bt.service +%{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service +%{_sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service +%{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service + %{_bindir}/bt-service %{_unitdir_user}/tizen-middleware.target.wants/bluetooth-frwk-service.service %{_unitdir_user}/bluetooth-frwk-service.service 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 3834ba4..22a0e7a 100644 --- a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec +++ b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec @@ -12,7 +12,7 @@ Name: crosswalk -Version: 8.36.155.0 +Version: 8.36.161.0 Release: 0 Summary: Crosswalk is an app runtime based on Chromium License: (BSD-3-Clause and LGPL-2.1+) @@ -165,7 +165,7 @@ if [ -n "${BUILDDIR_NAME}" ]; then fi %if %{with wayland} -GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=0" +GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1" %endif # Force gold binary from chroot ld.gold provided by binutils-gold diff --git a/proto-meta-Tizen_generic/specfile-initial/download-provider/packaging/download-provider.spec b/proto-meta-Tizen_generic/specfile-initial/download-provider/packaging/download-provider.spec index 740e723..195a277 100755 --- a/proto-meta-Tizen_generic/specfile-initial/download-provider/packaging/download-provider.spec +++ b/proto-meta-Tizen_generic/specfile-initial/download-provider/packaging/download-provider.spec @@ -1,23 +1,19 @@ - Name: download-provider Summary: Download the contents in background -Version: 1.0.5 -Release: 10 -Group: Development/Libraries -License: Apache License, Version 2.0 +Version: 1.1.6 +Release: 0 +Group: System/Libraries +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1: download-provider.service -Source101: org.download-provider.conf -Source1001: download-provider.manifest -Requires(post): /usr/bin/sqlite3 BuildRequires: cmake +BuildRequires: fdupes +BuildRequires: libprivilege-control-conf BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(xdgmime) BuildRequires: pkgconfig(vconf) -BuildRequires: pkgconfig(db-util) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(capi-base-common) @@ -25,10 +21,16 @@ BuildRequires: pkgconfig(capi-appfw-app-manager) BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(appsvc) -BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(wifi-direct) +BuildRequires: pkgconfig(libsmack) +BuildRequires: gettext-devel +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libtzplatform-config) Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +Requires(post): vconf +Requires: sqlite +Requires: connman + %description Description: download the contents in background @@ -38,19 +40,16 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Description: download the contents in background (developement files) +Description: download the contents in background (development files) %prep %setup -q -cp %{SOURCE101} . -cp %{SOURCE1001} . -%define _imagedir /usr/share/download-provider -%define _databasedir /opt/usr/dbspace -%define _databasefile %{_databasedir}/.download-provider.db -%define _dbusservicedir /usr/share/dbus-1/system-services -%define _dbuspolicydir /etc/dbus-1/system.d -%define _licensedir /usr/share/license +%define _data_install_path %{_datadir}/%{name} +%define _imagedir %{_data_install_path}/images +%define _localedir %{_data_install_path}/locales +%define _sqlschemadir %{_data_install_path}/sql +%define _sqlschemafile %{_sqlschemadir}/download-provider-schema.sql %define cmake \ CFLAGS="${CFLAGS:-%optflags} -fPIC -D_REENTRANT -fvisibility=hidden"; export CFLAGS \ @@ -65,10 +64,10 @@ cp %{SOURCE1001} . -DPKG_VERSION=%{version} \\\ -DPKG_RELEASE=%{release} \\\ -DIMAGE_DIR:PATH=%{_imagedir} \\\ - -DDATABASE_FILE:PATH=%{_databasefile} \\\ - -DDBUS_SERVICE_DIR:PATH=%{_dbusservicedir} \\\ - -DLICENSE_DIR:PATH=%{_licensedir} \\\ - -DSUPPORT_DBUS_SYSTEM:BOOL=ON \\\ + -DLOCALE_DIR:PATH=%{_localedir} \\\ + -DSYSTEMD_DIR:PATH=%{_unitdir} \\\ + -DDATABASE_SCHEMA_DIR=%{_sqlschemadir} \\\ + -DDATABASE_SCHEMA_FILE=%{_sqlschemafile} \\\ -DSUPPORT_WIFI_DIRECT:BOOL=OFF \\\ -DSUPPORT_LOG_MESSAGE:BOOL=ON \\\ -DSUPPORT_CHECK_IPC:BOOL=ON \\\ @@ -79,127 +78,58 @@ cp %{SOURCE1001} . -DBUILD_SHARED_LIBS:BOOL=ON %build +%if 0%{?tizen_build_binary_release_type_eng} +export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" +export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" +%endif %cmake . make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} %make_install - -install -d -m 755 %{buildroot}%{_dbuspolicydir} -install -m 644 %{SOURCE101} %{buildroot}%{_dbuspolicydir} - -mkdir -p %{buildroot}%{_licensedir} -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d -ln -s %{_sysconfdir}/rc.d/init.d/download-provider-service %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S70download-provider-service -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d -ln -s %{_sysconfdir}/rc.d/init.d/download-provider-service %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S70download-provider-service - -mkdir -p %{buildroot}/%{_unitdir}/graphical.target.wants -install %{SOURCE1} %{buildroot}/%{_unitdir}/ -ln -s ../download-provider.service %{buildroot}/%{_unitdir}/graphical.target.wants/ - -mkdir -p %{buildroot}/opt/data/%{name} -mkdir -p %{buildroot}%{_databasedir} -if [ ! -f %{buildroot}%{_databasefile} ]; -then -sqlite3 %{buildroot}%{_databasefile} 'PRAGMA journal_mode=PERSIST; -PRAGMA foreign_keys=ON; -CREATE TABLE logging -( -id INTEGER UNIQUE PRIMARY KEY, -state INTEGER DEFAULT 0, -errorcode INTEGER DEFAULT 0, -startcount INTEGER DEFAULT 0, -packagename TEXT DEFAULT NULL, -createtime DATE, -accesstime DATE -); - -CREATE TABLE requestinfo -( -id INTEGER UNIQUE PRIMARY KEY, -auto_download BOOLEAN DEFAULT 0, -state_event BOOLEAN DEFAULT 0, -progress_event BOOLEAN DEFAULT 0, -noti_enable BOOLEAN DEFAULT 0, -network_type TINYINT DEFAULT 0, -filename TEXT DEFAULT NULL, -destination TEXT DEFAULT NULL, -url TEXT DEFAULT NULL, -FOREIGN KEY(id) REFERENCES logging(id) ON DELETE CASCADE -); - -CREATE TABLE downloadinfo -( -id INTEGER UNIQUE PRIMARY KEY, -http_status INTEGER DEFAULT 0, -content_size UNSIGNED BIG INT DEFAULT 0, -mimetype VARCHAR(64) DEFAULT NULL, -content_name TEXT DEFAULT NULL, -saved_path TEXT DEFAULT NULL, -tmp_saved_path TEXT DEFAULT NULL, -etag TEXT DEFAULT NULL, -FOREIGN KEY(id) REFERENCES logging(id) ON DELETE CASCADE -); - -CREATE TABLE httpheaders -( -id INTEGER NOT NULL, -header_field TEXT DEFAULT NULL, -header_data TEXT DEFAULT NULL, -FOREIGN KEY(id) REFERENCES logging(id) ON DELETE CASCADE -); - -CREATE TABLE notification -( -id INTEGER NOT NULL, -extra_key TEXT DEFAULT NULL, -extra_data TEXT DEFAULT NULL, -FOREIGN KEY(id) REFERENCES logging(id) ON DELETE CASCADE -); - -CREATE UNIQUE INDEX requests_index ON logging (id, state, errorcode, packagename, createtime, accesstime); -' -fi - +mkdir -p %{buildroot}/%{_data_install_path} +mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants +mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants +ln -s ../download-provider.service %{buildroot}%{_unitdir}/graphical.target.wants/ +ln -s ../download-provider.socket %{buildroot}%{_unitdir}/sockets.target.wants/ +%fdupes %{buildroot}%{_localedir} %post /sbin/ldconfig +%systemd_post %{name}.service +vconftool set -t int db/setting/default_memory/wap 0 + +%preun +%systemd_preun %{name}.service %postun /sbin/ldconfig - +%systemd_postun %{name}.service %files %defattr(-,root,root,-) %manifest %{name}.manifest -%dir %attr(0775,root,app) /opt/data/%{name} +%license LICENSE.APLv2 +%{_bindir}/%{name} %{_imagedir}/*.png -%{_libdir}/libdownloadagent2.so.0.0.1 -%{_libdir}/libdownloadagent2.so +%{_imagedir}/*.gif +%{_libdir}/libdownloadagent2.so* +%{_libdir}/libdownload-provider-interface.so* %{_unitdir}/download-provider.service %{_unitdir}/graphical.target.wants/download-provider.service -%{_libdir}/libdownload-provider-interface.so.%{version} -%{_libdir}/libdownload-provider-interface.so.0 -%{_bindir}/%{name} -%{_sysconfdir}/rc.d/init.d/download-provider-service -%{_sysconfdir}/rc.d/rc3.d/S70download-provider-service -%{_sysconfdir}/rc.d/rc5.d/S70download-provider-service -%{_licensedir}/%{name} -%{_dbusservicedir}/org.download-provider.service -%{_dbuspolicydir}/org.download-provider.conf -%attr(660,root,app) /opt/usr/dbspace/.download-provider.db -%attr(660,root,app) /opt/usr/dbspace/.download-provider.db-journal +%{_unitdir}/download-provider.socket +%{_unitdir}/sockets.target.wants/download-provider.socket +%{_sqlschemafile} +%{_localedir}/* %files devel -%manifest %{name}.manifest %defattr(-,root,root,-) +%manifest %{name}.manifest %{_libdir}/libdownloadagent2.so %{_libdir}/libdownload-provider-interface.so %{_includedir}/download-provider/download-provider-defs.h %{_includedir}/download-provider/download-provider-interface.h -%{_bindir}/%{name} %{_libdir}/pkgconfig/download-provider.pc %{_libdir}/pkgconfig/download-provider-interface.pc diff --git a/proto-meta-Tizen_generic/specfile-initial/favorites/packaging/capi-web-favorites.spec b/proto-meta-Tizen_generic/specfile-initial/favorites/packaging/capi-web-favorites.spec index 9355728..e439046 100644 --- a/proto-meta-Tizen_generic/specfile-initial/favorites/packaging/capi-web-favorites.spec +++ b/proto-meta-Tizen_generic/specfile-initial/favorites/packaging/capi-web-favorites.spec @@ -11,6 +11,7 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(db-util) BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(capi-base-common) +BuildRequires: pkgconfig(libtzplatform-config) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -31,7 +32,7 @@ cp %{SOURCE1001} . %build -%cmake . +%cmake . -DTZ_SYS_SHARE=%TZ_SYS_SHARE make %{?jobs:-j%jobs} %install @@ -39,84 +40,20 @@ make %{?jobs:-j%jobs} %post /sbin/ldconfig -mkdir -p /opt/usr/dbspace/ -##### History ###### -if [ ! -f /opt/usr/dbspace/.browser-history.db ]; -then - sqlite3 /opt/usr/dbspace/.browser-history.db 'PRAGMA journal_mode=PERSIST; - CREATE TABLE history( - id INTEGER PRIMARY KEY AUTOINCREMENT - , address - , title - , counter INTEGER - , visitdate DATETIME - , favicon BLOB - , favicon_length INTEGER - , favicon_w INTEGER - , favicon_h INTEGER - , snapshot BLOB - , snapshot_stride INTEGER - , snapshot_w INTEGER - , snapshot_h INTEGER);' -fi -### Bookmark ### -if [ ! -f /opt/usr/dbspace/.internet_bookmark.db ]; -then - sqlite3 /opt/usr/dbspace/.internet_bookmark.db 'PRAGMA journal_mode=PERSIST; - CREATE TABLE bookmarks( - id INTEGER PRIMARY KEY AUTOINCREMENT - ,type INTEGER - ,parent INTEGER - ,address - ,title - ,creationdate - ,sequence INTEGER - ,updatedate - ,visitdate - ,editable INTEGER - ,accesscount INTEGER - ,favicon BLOB - ,favicon_length INTEGER - ,favicon_w INTEGER - ,favicon_h INTEGER - ,created_date - ,account_name - ,account_type - ,thumbnail BLOB - ,thumbnail_length INTEGER - ,thumbnail_w INTEGER - ,thumbnail_h INTEGER - ,version INTEGER - ,sync - ,tag1 - ,tag2 - ,tag3 - ,tag4 - ); - create index idx_bookmarks_on_parent_type on bookmarks(parent, type); +source /etc/tizen-platform.conf +users_gid=$(getent group $TZ_SYS_USER_GROUP | cut -f3 -d':') - CREATE TABLE tags( - tag - );' -fi -# Change db file owner & permission -chown :5000 /opt/usr/dbspace/.browser-history.db -chown :5000 /opt/usr/dbspace/.browser-history.db-journal -chown :5000 /opt/usr/dbspace/.internet_bookmark.db -chown :5000 /opt/usr/dbspace/.internet_bookmark.db-journal -chmod 666 /opt/usr/dbspace/.browser-history.db -chmod 666 /opt/usr/dbspace/.browser-history.db-journal -chmod 666 /opt/usr/dbspace/.internet_bookmark.db -chmod 666 /opt/usr/dbspace/.internet_bookmark.db-journal +chsmack -a 'User' /opt/usr/dbspace/.browser-history.db* +chsmack -a 'User' /opt/usr/dbspace/.internet_bookmark.db* # set default vconf values ################################################## #internal keys -vconftool set -t string db/browser/browser_user_agent "System user agent" -g 5000 -f -vconftool set -t string db/browser/custom_user_agent "" -g 5000 -f +vconftool set -t string db/browser/browser_user_agent "System user agent" -g $users_gid -f +vconftool set -t string db/browser/custom_user_agent "" -g $users_gid -f #public keys -vconftool set -t string db/browser/user_agent "Mozilla/5.0 (Linux; Tizen 2.1; sdk) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.1 Mobile Safari/537.3" -g 5000 -f +vconftool set -t string db/browser/user_agent "Mozilla/5.0 (Linux; Tizen 2.1; sdk) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.1 Mobile Safari/537.3" -g $users_gid -f %postun -p /sbin/ldconfig @@ -124,6 +61,8 @@ vconftool set -t string db/browser/user_agent "Mozilla/5.0 (Linux; Tizen 2.1; sd %files %manifest %{name}.manifest %{_libdir}/libcapi-web-favorites.so +%attr(0755,root,%TZ_SYS_USER_GROUP) %TZ_SYS_SHARE/%{name}/internet_bookmark_DB_init.sh +%attr(0755,root,%TZ_SYS_USER_GROUP) %TZ_SYS_SHARE/%{name}/browser_history_DB_init.sh %files devel %manifest %{name}.manifest diff --git a/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec b/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec index f3e5c99..646b79e 100755 --- a/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(mm-fileinfo) BuildRequires: pkgconfig(media-thumbnail) BuildRequires: pkgconfig(drm-client) BuildRequires: pkgconfig(libmedia-utils) +BuildRequires: pkgconfig(libtzplatform-config) %description Media information service library for multimedia applications diff --git a/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec b/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec index dc252c3..fd0f310 100644 --- a/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(mm-fileinfo) BuildRequires: pkgconfig(mmutil-imgp) BuildRequires: pkgconfig(mmutil-jpeg) BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(libtzplatform-config) Requires: media-server %description diff --git a/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec b/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec index 9e0bf42..2a1f9e3 100644 --- a/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec @@ -14,6 +14,7 @@ BuildRequires: pkgconfig(mm-ta) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: libjpeg-turbo-devel +BuildRequires: pkgconfig(libtzplatform-config) BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/proto-meta-Tizen_generic/specfile-initial/media-content/packaging/capi-content-media-content.spec b/proto-meta-Tizen_generic/specfile-initial/media-content/packaging/capi-content-media-content.spec index af0094b..61e939b 100755 --- a/proto-meta-Tizen_generic/specfile-initial/media-content/packaging/capi-content-media-content.spec +++ b/proto-meta-Tizen_generic/specfile-initial/media-content/packaging/capi-content-media-content.spec @@ -12,7 +12,7 @@ BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(libmedia-service) BuildRequires: pkgconfig(media-thumbnail) BuildRequires: pkgconfig(libmedia-utils) - +BuildRequires: pkgconfig(libtzplatform-config) %description A Media content library in SLP C API. diff --git a/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec b/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec index f181f34..989f06d 100755 --- a/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec +++ b/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec @@ -9,7 +9,7 @@ Source1: media-server.service Source1001: %{name}.manifest Source1002: libmedia-utils.manifest Source1003: libmedia-utils-devel.manifest - +Source1004: media-data-sdk_create_db.sh Requires(post): /usr/bin/vconftool BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(vconf) @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(db-util) BuildRequires: pkgconfig(notification) +BuildRequires: pkgconfig(libtzplatform-config) %description Description: File manager service server @@ -29,6 +30,7 @@ Description: File manager service server %package -n libmedia-utils Summary: media server runtime library. Group: Multimedia/Libraries +Requires: media-server = %{version}-%{release} %description -n libmedia-utils Description : media server runtime library. @@ -38,6 +40,7 @@ Description : media server runtime library. Summary: media server development library. Group: Development/Multimedia Requires: libmedia-utils = %{version}-%{release} +Requires: libtzplatform-config-devel %description -n libmedia-utils-devel Description: media server development library. @@ -59,6 +62,20 @@ make %{?jobs:-j%jobs} mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants install -m 644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/media-server.service ln -s ../media-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/media-server.service +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Camera +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Downloads +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Images +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Sounds/Voice\ recorder +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Videos +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/mmc +mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/phone +install -m 0775 ./data-media/Images/* %{buildroot}%{TZ_SYS_DATA}/data-media/Images/ +install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/thumb_default.png %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/ +install -D -m 0775 ./data-media/dbspace/file-manager-service/.thumb/mmc/* %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/mmc/ +install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/PHONE_THUMB_HERE %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/phone/ +install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/.jpg* %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/phone/ +install -D -m 0775 ./data-media/dbspace/file-manager-service/* %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/ +install -m 0775 %{SOURCE1004} %{buildroot}%{_bindir}/media-data-sdk_create_db.sh %post vconftool set -t int db/filemanager/dbupdate "1" -f @@ -66,7 +83,8 @@ vconftool set -t int memory/filemanager/Mmc "0" -i -f vconftool set -t string db/private/mediaserver/mmc_info "" -f vconftool set -t int file/private/mediaserver/scan_internal "1" -f vconftool set -t int file/private/mediaserver/scan_directory "1" -f - +chgrp %TZ_SYS_USER_GROUP %{_bindir}/media-data-sdk_create_db.sh +chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/data-media %post -n libmedia-utils -p /sbin/ldconfig %postun -n libmedia-utils -p /sbin/ldconfig @@ -83,7 +101,9 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f /usr/lib/systemd/system/media-server.service /usr/lib/systemd/system/multi-user.target.wants/media-server.service %license LICENSE.APLv2.0 - +%{_bindir}/media-data-sdk_create_db.sh +%{TZ_SYS_DATA}/data-media/* +%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/* %files -n libmedia-utils %manifest libmedia-utils.manifest @@ -98,4 +118,3 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f %{_libdir}/libmedia-utils.so %{_libdir}/pkgconfig/libmedia-utils.pc %{_includedir}/media-utils/*.h - diff --git a/proto-meta-Tizen_generic/specfile-initial/syspopup/packaging/syspopup.spec b/proto-meta-Tizen_generic/specfile-initial/syspopup/packaging/syspopup.spec old mode 100755 new mode 100644 index c1443f1..197307f --- a/proto-meta-Tizen_generic/specfile-initial/syspopup/packaging/syspopup.spec +++ b/proto-meta-Tizen_generic/specfile-initial/syspopup/packaging/syspopup.spec @@ -3,7 +3,7 @@ Name: syspopup Summary: Syspopup package -Version: 0.0.92 +Version: 0.0.100 Release: 0 Group: System/Libraries License: Apache-2.0 @@ -12,6 +12,7 @@ Source1001: %{name}.manifest Source1002: %{name}-devel.manifest Source1003: %{name}-caller.manifest Source1004: %{name}-caller-devel.manifest + BuildRequires: cmake BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(bundle) @@ -73,6 +74,11 @@ make %{?jobs:-j%jobs} %install %make_install +mkdir -p %{buildroot}/usr/share/license +install LICENSE %{buildroot}/usr/share/license/%{name} +install LICENSE %{buildroot}/usr/share/license/%{name}-devel +install LICENSE %{buildroot}/usr/share/license/%{name}-caller +install LICENSE %{buildroot}/usr/share/license/%{name}-caller-devel mkdir -p %{buildroot}%{TZ_SYS_DB} sqlite3 %{buildroot}%{TZ_SYS_DB}/.syspopup.db < %{buildroot}/usr/share/syspopup/syspopup_db.sql @@ -101,6 +107,7 @@ touch %{buildroot}%{_datadir}/popup_noti_term %attr(644,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.syspopup.db %attr(644,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.syspopup.db-journal +/usr/share/license/%{name} %files devel %manifest %{name}-devel.manifest @@ -109,11 +116,13 @@ touch %{buildroot}%{_datadir}/popup_noti_term %{_includedir}/syspopup.h %{_libdir}/libsyspopup.so %{_libdir}/pkgconfig/syspopup.pc +/usr/share/license/%{name}-devel %files caller %manifest %{name}-caller.manifest %defattr(-,root,root,-) %{_libdir}/libsyspopup_caller.so.0.1.0 +/usr/share/license/%{name}-caller %files caller-devel %manifest %{name}-caller-devel.manifest @@ -121,8 +130,16 @@ touch %{buildroot}%{_datadir}/popup_noti_term %{_libdir}/libsyspopup_caller.so %{_includedir}/syspopup_caller.h %{_libdir}/pkgconfig/syspopup-caller.pc +/usr/share/license/%{name}-caller-devel + %changelog +* Tue Aug 13 2013 - Hyungdeuk Kim +- Add key handler for esc of keyboard + +* Fri Jun 21 2013 - Hyungdeuk Kim +- Change end key term info of wifi-qs + * Fri Apr 12 2013 - Hyungdeuk Kim - Remove drm syspopup requested by hakjoo.ko diff --git a/proto-meta-Tizen_generic/specfile-initial/system-settings/packaging/capi-system-system-settings.spec b/proto-meta-Tizen_generic/specfile-initial/system-settings/packaging/capi-system-system-settings.spec index 03e6d09..79a1d54 100755 --- a/proto-meta-Tizen_generic/specfile-initial/system-settings/packaging/capi-system-system-settings.spec +++ b/proto-meta-Tizen_generic/specfile-initial/system-settings/packaging/capi-system-system-settings.spec @@ -1,19 +1,27 @@ +%bcond_with x +%bcond_with wayland + Name: capi-system-system-settings Summary: A System Settings library in Tizen Native API Version: 0.0.2 -Release: 3 +Release: 0 Group: System/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: %{name}.manifest -Source1002: %{name}-devel.manifest +Source1001: %{name}.manifest +Source1002: %{name}-devel.manifest BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(ecore) -BuildRequires: pkgconfig(ecore-x) +%if %{with x} +BuildRequires: pkgconfig(ecore-x) +%endif +%if %{with wayland} +BuildRequires: pkgconfig(ecore-wayland) +%endif BuildRequires: pkgconfig(ecore-file) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(capi-base-common) @@ -21,6 +29,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libtzplatform-config) %description A System Settings library in Tizen Native API. @@ -44,7 +53,17 @@ cp %{SOURCE1001} %{SOURCE1002} . %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ +%if %{with x} + -DX11_SUPPORT=On \ +%else + -DX11_SUPPORT=Off \ +%endif +%if %{with wayland} + -DWAYLAND_SUPPORT=On +%else + -DWAYLAND_SUPPORT=Off +%endif make %{?jobs:-j%jobs} diff --git a/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec new file mode 100644 index 0000000..e54c378 --- /dev/null +++ b/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec @@ -0,0 +1,246 @@ +%bcond_with wayland + +%define _manifestdir %{TZ_SYS_RW_PACKAGES} +%define _desktop_icondir %{TZ_SYS_SHARE}/icons/default/small +%define _bluetooth_demo_package tizen-extensions-crosswalk-bluetooth-demo +%define _examples_package tizen-extensions-crosswalk-examples +%define _system_info_demo_package tizen-extensions-crosswalk-system-info-demo +%define _audiosystem_demo_package tizen-extensions-crosswalk-audiosystem-demo + +Name: tizen-extensions-crosswalk +Version: 0.75 +Release: 0 +License: BSD-3-Clause and Apache-2.0 +Group: Development/Libraries +Summary: Tizen Web APIs implemented using Crosswalk +URL: https://github.com/otcshare/tizen-extensions-crosswalk +Source0: %{name}-%{version}.tar.gz +Source1: %{name}.in +Source2: %{name}.png +Source3: %{_bluetooth_demo_package} +Source4: %{_examples_package} +Source5: %{_system_info_demo_package} +Source6: %{_audiosystem_demo_package} +Source1001: %{name}.manifest + +BuildRequires: ninja +BuildRequires: pkgconfig(appcore-common) +BuildRequires: pkgconfig(bluez) +BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(capi-appfw-app-manager) +BuildRequires: pkgconfig(capi-appfw-package-manager) +BuildRequires: pkgconfig(capi-network-bluetooth) +BuildRequires: pkgconfig(capi-network-connection) +BuildRequires: pkgconfig(capi-system-device) +BuildRequires: pkgconfig(capi-system-info) +BuildRequires: pkgconfig(capi-system-power) +BuildRequires: pkgconfig(capi-system-runtime-info) +BuildRequires: pkgconfig(capi-system-sensor) +BuildRequires: pkgconfig(capi-system-system-settings) +BuildRequires: pkgconfig(libtzplatform-config) +%if "%{profile}" == "ivi" +BuildRequires: pkgconfig(automotive-message-broker) +%endif +# For IVI, it doesn't need sim package. +%if "%{profile}" == "mobile" +BuildRequires: pkgconfig(capi-telephony-sim) +BuildRequires: pkgconfig(contacts-service2) +BuildRequires: pkgconfig(libpcrecpp) +%endif +BuildRequires: pkgconfig(capi-web-favorites) +BuildRequires: pkgconfig(capi-web-url-download) +BuildRequires: pkgconfig(capi-content-media-content) +BuildRequires: pkgconfig(dbus-glib-1) +# Evas.h is required by capi-web-favorites. +BuildRequires: pkgconfig(evas) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(tapi) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libpulse) >= 5.0 +BuildRequires: pkgconfig(message-port) +BuildRequires: pkgconfig(notification) +BuildRequires: pkgconfig(pkgmgr) +BuildRequires: pkgconfig(pkgmgr-info) +BuildRequires: pkgconfig(pmapi) +BuildRequires: pkgconfig(vconf) +%if %{with wayland} +BuildRequires: pkgconfig(wayland-client) +%else +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrandr) +%endif +BuildRequires: python +Requires: crosswalk +# For Content API +Requires: media-thumbnail-server + +%description +Tizen Web APIs implemented using Crosswalk. + +%package -n %{_bluetooth_demo_package} +Summary: Tizen Web APIs using Crosswalk demo +Group: Development/Libraries +Requires: %{name} + +%description -n %{_bluetooth_demo_package} +Tizen Web APIs bluetooth demo implementation using Crosswalk. + +%package -n %{_examples_package} +Summary: Tizen Web APIs using Crosswalk examples +Group: Development/Libraries +Requires: %{name} + +%description -n %{_examples_package} +Tizen Web APIs examples using Crosswalk. + +%package -n %{_system_info_demo_package} +Summary: Tizen Web APIs using Crosswalk system info demo +Group: Development/Libraries +Requires: %{name} + +%description -n %{_system_info_demo_package} +Tizen Web APIs system info demo implementation using Crosswalk. + +%package -n %{_audiosystem_demo_package} +Summary: Sample volume control applicaiton +Group: Development/Libraries +Requires: %{name} + +%description -n %{_audiosystem_demo_package} +Sample Tizen volume control application that demonstrates the Tizen AudioSystem API usage. + +%prep +%setup -q + +cp %{SOURCE1001} . +cp %{SOURCE1} . +cp %{SOURCE2} . +cp %{SOURCE3} . +cp %{SOURCE4} . +cp %{SOURCE5} . + +sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" %{name}.in > %{name} + +%build + +export GYP_GENERATORS='ninja' +GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Debug -Dextension_host_os=%{profile}" + +%if %{with wayland} +GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=wayland" +%else +GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=x11" +%endif + +./tools/gyp/gyp $GYP_OPTIONS tizen-wrt.gyp + +ninja -C out/Default %{?_smp_mflags} + +%install + +# Binary wrapper. +install -m 755 -D %{name} %{buildroot}%{_bindir}/%{name} +install -m 755 -D %{SOURCE3} %{buildroot}%{_bindir}/%{_bluetooth_demo_package} +install -m 755 -D %{SOURCE4} %{buildroot}%{_bindir}/%{_examples_package} +install -m 755 -D %{SOURCE5} %{buildroot}%{_bindir}/%{_system_info_demo_package} +install -m 755 -D %{SOURCE6} %{buildroot}%{_bindir}/%{_audiosystem_demo_package} + +# Extensions. +mkdir -p %{buildroot}%{_libdir}/%{name} +install -p -m 644 out/Default/libtizen*.so %{buildroot}%{_libdir}/%{name} + +# Examples. +mkdir -p %{buildroot}%{_datarootdir}/%{name}/examples +mkdir -p %{buildroot}%{_datarootdir}/%{name}/examples/js +install -p -m 644 examples/*.html %{buildroot}%{_datarootdir}/%{name}/examples +install -p -m 644 examples/js/*.js %{buildroot}%{_datarootdir}/%{name}/examples/js + +# Demos +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/tizen +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/tizen/css +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/tizen/js +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/tizen/images + +install -p -m 644 demos/tizen/*.html %{buildroot}%{_datarootdir}/%{name}/demos/tizen +install -p -m 644 demos/tizen/css/*.css %{buildroot}%{_datarootdir}/%{name}/demos/tizen/css +install -p -m 644 demos/tizen/js/*.js %{buildroot}%{_datarootdir}/%{name}/demos/tizen/js +install -p -m 644 demos/tizen/images/*.png %{buildroot}%{_datarootdir}/%{name}/demos/tizen/images + +# Demos - System Info +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/system_info +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/system_info/css +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/system_info/js +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/system_info/images + +install -p -m 644 demos/system_info/*.html %{buildroot}%{_datarootdir}/%{name}/demos/system_info +install -p -m 644 demos/system_info/css/*.css %{buildroot}%{_datarootdir}/%{name}/demos/system_info/css +install -p -m 644 demos/system_info/js/*.js %{buildroot}%{_datarootdir}/%{name}/demos/system_info/js +install -p -m 644 demos/system_info/images/*.png %{buildroot}%{_datarootdir}/%{name}/demos/system_info/images + +# Demos - audiosystem api +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/css +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/css/ui-lightness +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/css/ui-lightness/images +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/js +mkdir -p %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/images + +install -p -m 644 demos/audiosystem/*.html %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem +install -p -m 644 demos/audiosystem/css/*.css %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/css +install -p -m 644 demos/audiosystem/css/ui-lightness/*.css %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/css/ui-lightness +install -p -m 644 demos/audiosystem/css/ui-lightness/images/* %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/css/ui-lightness/images +install -p -m 644 demos/audiosystem/js/*.js %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/js +install -p -m 644 demos/audiosystem/images/*.png %{buildroot}%{_datarootdir}/%{name}/demos/audiosystem/images + +# register to the package manager +install -m 644 -D %{_examples_package}.xml %{buildroot}%{_manifestdir}/%{_examples_package}.xml +install -m 644 -D %{_bluetooth_demo_package}.xml %{buildroot}%{_manifestdir}/%{_bluetooth_demo_package}.xml +install -m 644 -D %{_system_info_demo_package}.xml %{buildroot}%{_manifestdir}/%{_system_info_demo_package}.xml +install -m 644 -D %{_audiosystem_demo_package}.xml %{buildroot}%{_manifestdir}/%{_audiosystem_demo_package}.xml +install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{_examples_package}.png +install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{_bluetooth_demo_package}.png +install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{_system_info_demo_package}.png +install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{_audiosystem_demo_package}.png + +%files +# TODO(rakuco): This causes problems on 2.1 when creating the package. +# %license LICENSE +%{_bindir}/%{name} +%{_libdir}/%{name}/libtizen*.so + +%files -n %{_bluetooth_demo_package} +%{_bindir}/%{_bluetooth_demo_package} +%{_manifestdir}/%{_bluetooth_demo_package}.xml +%{_desktop_icondir}/%{_bluetooth_demo_package}.png +%{_datarootdir}/%{name}/demos/tizen/*.html +%{_datarootdir}/%{name}/demos/tizen/css/*.css +%{_datarootdir}/%{name}/demos/tizen/js/*.js +%{_datarootdir}/%{name}/demos/tizen/images/*.png + +%files -n %{_examples_package} +%{_bindir}/%{_examples_package} +%{_manifestdir}/%{_examples_package}.xml +%{_desktop_icondir}/%{_examples_package}.png +%{_datarootdir}/%{name}/examples/*.html +%{_datarootdir}/%{name}/examples/js/*.js + +%files -n %{_system_info_demo_package} +%{_bindir}/%{_system_info_demo_package} +%{_manifestdir}/%{_system_info_demo_package}.xml +%{_desktop_icondir}/%{_system_info_demo_package}.png +%{_datarootdir}/%{name}/demos/system_info/*.html +%{_datarootdir}/%{name}/demos/system_info/css/*.css +%{_datarootdir}/%{name}/demos/system_info/js/*.js +%{_datarootdir}/%{name}/demos/system_info/images/*.png + +%files -n %{_audiosystem_demo_package} +%{_bindir}/%{_audiosystem_demo_package} +%{_manifestdir}/%{_audiosystem_demo_package}.xml +%{_desktop_icondir}/%{_audiosystem_demo_package}.png +%{_datarootdir}/%{name}/demos/audiosystem/index.html +%{_datarootdir}/%{name}/demos/audiosystem/css/*.css +%{_datarootdir}/%{name}/demos/audiosystem/css/ui-lightness/*.css +%{_datarootdir}/%{name}/demos/audiosystem/css/ui-lightness/images/* +%{_datarootdir}/%{name}/demos/audiosystem/js/*.js +%{_datarootdir}/%{name}/demos/audiosystem/images/* diff --git a/proto-meta-Tizen_generic/specfile-initial/url-download/packaging/capi-web-url-download.spec b/proto-meta-Tizen_generic/specfile-initial/url-download/packaging/capi-web-url-download.spec old mode 100755 new mode 100644 index 62f84fc..15f1520 --- a/proto-meta-Tizen_generic/specfile-initial/url-download/packaging/capi-web-url-download.spec +++ b/proto-meta-Tizen_generic/specfile-initial/url-download/packaging/capi-web-url-download.spec @@ -1,20 +1,20 @@ Name: capi-web-url-download Summary: CAPI for content download with web url -Version: 1.0.2 -Release: 5 +Version: 1.1.1 +Release: 0 Group: Development/Libraries -License: Apache License, Version 2.0 +License: Apache-2.0 URL: https://review.tizen.org/git/?p=platform/core/api/url-download.git;a=summary Source0: %{name}-%{version}.tar.gz -Source1001: capi-web-url-download.manifest BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(download-provider-interface) BuildRequires: cmake %description -CAPI for the content download +Core APIs for the content download with web url %package devel Summary: CAPI web url development files @@ -26,9 +26,13 @@ CAPI for content downloading with web url (development files) %prep %setup -q -cp %{SOURCE1001} . %build +%if 0%{?tizen_build_binary_release_type_eng} +export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" +export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" +%endif %cmake . make %{?jobs:-j%jobs} @@ -43,15 +47,17 @@ mkdir -p %{buildroot}/usr/share/license %postun -p /sbin/ldconfig %files -%manifest %{name}.manifest %defattr(-,root,root,-) +%manifest capi-web-url-download.manifest %{_libdir}/libcapi-web-url-download.so.* /usr/share/license/%{name} %files devel -%manifest %{name}.manifest %defattr(-,root,root,-) %manifest capi-web-url-download.manifest %{_libdir}/libcapi-web-url-download.so %{_libdir}/pkgconfig/capi-web-url-download.pc %{_includedir}/web/download.h +%{_includedir}/web/download_doc.h + +%changelog diff --git a/proto-meta-Tizen_generic/specfile-initial/vconf/packaging/vconf.spec b/proto-meta-Tizen_generic/specfile-initial/vconf/packaging/vconf.spec index 413fefd..20977b9 100755 --- a/proto-meta-Tizen_generic/specfile-initial/vconf/packaging/vconf.spec +++ b/proto-meta-Tizen_generic/specfile-initial/vconf/packaging/vconf.spec @@ -61,6 +61,9 @@ ln -sf ../vconf-setup.service %{buildroot}%{_unitdir}/basic.target.wants/ %post /sbin/ldconfig systemctl daemon-reload +chsmack -a 'User' %{TZ_SYS_CONFIG} +chsmack -a 'User' %{TZ_SYS_CONFIG}/db +chsmack -a 'User' %{TZ_SYS_CONFIG}/db/.backup %postun /sbin/ldconfig @@ -75,7 +78,7 @@ systemctl daemon-reload %{_bindir}/vconf-init %config(missingok) %attr(644,root,root) %{TZ_SYS_CONFIG}/kdb_first_boot %{_libdir}/*.so.* -%dir %attr(777,root,root) %{TZ_SYS_CONFIG}/db +%dir %attr(777,root,%TZ_SYS_USER_GROUP) %{TZ_SYS_CONFIG}/db %dir %attr(777,root,root) %{TZ_SYS_CONFIG}/db/.backup %{_unitdir}/basic.target.wants/vconf-setup.service %{_unitdir}/vconf-setup.service diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py index 82d01b7..2759554 100755 --- a/tools/spec2yocto.py +++ b/tools/spec2yocto.py @@ -413,13 +413,13 @@ def findSpecPatchFiles( patch_dir_path, package_name_list ): patch_dir_path = os.path.expanduser( patch_dir_path ) patch_dir_path = os.path.expandvars( patch_dir_path ) - - for patch_name in set( package_name_list ): - for patch_extend in ["", "-yocto"]: - patch_file = patch_name + patch_extend + ".spec.patch" - patch_path = os.path.join( patch_dir_path, patch_file ) - if os.path.isfile( patch_path ): - patch_list.append( patch_path ) + if package_name_list is not None: + for patch_name in set( package_name_list ): + for patch_extend in ["", "-yocto"]: + patch_file = patch_name + patch_extend + ".spec.patch" + patch_path = os.path.join( patch_dir_path, patch_file ) + if os.path.isfile( patch_path ): + patch_list.append( patch_path ) return patch_list @@ -700,6 +700,7 @@ class SpecParser: rpmspec_command += " --define='BUILD_BASENAME %{basename}' " rpmspec_command += " --define='find_lang #find_lang' " + rpmspec_command += " --define='with_wayland 1' " rpmspec_command += " --target='%s' " % current_cpu # need to be change. -- 2.7.4