specfiles: update to latest IVI 36/34536/1
authorPatrick Ohly <patrick.ohly@intel.com>
Mon, 26 Jan 2015 09:51:03 +0000 (01:51 -0800)
committerPatrick Ohly <patrick.ohly@intel.com>
Wed, 28 Jan 2015 16:58:30 +0000 (08:58 -0800)
This is the result of gitCloneAll.sh with the following manifest files
(more important ones first):
manifest_fix.xml (Commit "Clean Fix", Jan 12, 2015)
tizen-ivi_20150126.2_atom.xml
tizen-common_20150123.3_x86_64-wayland.xml

Change-Id: Ifb39cd22bba432c1083418d606d29baf40f43cab

49 files changed:
proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec
proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
proto-meta-Tizen_generic/specfile-initial/app-svc/packaging/app-svc.spec
proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec
proto-meta-Tizen_generic/specfile-initial/automotive-message-broker/packaging/automotive-message-broker.spec
proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
proto-meta-Tizen_generic/specfile-initial/bundle/packaging/bundle.spec
proto-meta-Tizen_generic/specfile-initial/buxton/packaging/buxton.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/common-crosswalk-suite/packaging/common-crosswalk-suite.spec
proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk-bin.spec
proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
proto-meta-Tizen_generic/specfile-initial/cynara/packaging/cynara.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/dbus-python/packaging/dbus-python.spec
proto-meta-Tizen_generic/specfile-initial/desktop-skin/packaging/desktop-skin.spec
proto-meta-Tizen_generic/specfile-initial/download-provider/packaging/download-provider.spec
proto-meta-Tizen_generic/specfile-initial/gsignond/packaging/gsignond.spec
proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen-sample-apps/packaging/ico-uxf-homescreen-sample-apps.spec
proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec
proto-meta-Tizen_generic/specfile-initial/ico-uxf-weston-plugin/packaging/ico-uxf-weston-plugin.spec
proto-meta-Tizen_generic/specfile-initial/ico-vic-amb-plugin/packaging/ico-vic-amb-plugin.spec
proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec
proto-meta-Tizen_generic/specfile-initial/libmm-common/packaging/libmm-common.spec
proto-meta-Tizen_generic/specfile-initial/libmm-fileinfo/packaging/libmm-fileinfo.spec
proto-meta-Tizen_generic/specfile-initial/libmm-sound/packaging/libmm-sound.spec
proto-meta-Tizen_generic/specfile-initial/libsecret/packaging/libsecret.spec
proto-meta-Tizen_generic/specfile-initial/libslp-location/packaging/libslp-location.spec
proto-meta-Tizen_generic/specfile-initial/libtbm/packaging/libtbm.spec
proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec
proto-meta-Tizen_generic/specfile-initial/neardal/packaging/neardal.spec
proto-meta-Tizen_generic/specfile-initial/ofono/packaging/ofono.spec
proto-meta-Tizen_generic/specfile-initial/opencore-amr/packaging/opencore-amr.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/pulseaudio-module-murphy-ivi/packaging/pulseaudio-module-murphy-ivi.spec
proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
proto-meta-Tizen_generic/specfile-initial/security-manager/packaging/security-manager.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
proto-meta-Tizen_generic/specfile-initial/smack/packaging/smack.spec
proto-meta-Tizen_generic/specfile-initial/sphinxbase/packaging/sphinxbase.spec
proto-meta-Tizen_generic/specfile-initial/systemd/packaging/systemd.spec
proto-meta-Tizen_generic/specfile-initial/tdb/packaging/tdb.spec
proto-meta-Tizen_generic/specfile-initial/tiff/packaging/tiff.spec
proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec
proto-meta-Tizen_generic/specfile-initial/vala/packaging/vala.spec
proto-meta-Tizen_generic/specfile-initial/vconf-buxton/packaging/vconf-buxton.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/wayland-ivi-extension/packaging/genivi-shell.spec
proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
proto-meta-Tizen_generic/specfile-initial/weston-common/packaging/weston-common.spec
proto-meta-Tizen_generic/specfile-initial/weston-ivi-shell/packaging/weston-ivi-shell.spec
proto-meta-Tizen_generic/specfile-initial/weston-ivi/packaging/weston-ivi.spec
proto-meta-Tizen_generic/specfile-initial/weston/packaging/weston.spec

index 8ba50d3..37d319c 100644 (file)
@@ -3,7 +3,7 @@
 
 Name:       Modello-Installer
 Summary:    Installer for Modello
-Version:    0.0.2
+Version:    0.0.3
 Release:    0
 Group:      Automotive/Modello
 License:    Apache-2.0
@@ -61,7 +61,7 @@ do
        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/*/)
+for list2 in $(ls -d $TZ_SYS_HOME/%{MODELLO_INSTALL_USER}/apps_rw/xwalk-service/applications/*/)
 do
         su %{MODELLO_INSTALL_USER} -c "mkdir -p '$list2/css'"
         su %{MODELLO_INSTALL_USER} -c "mkdir -p '$list2/js'"
@@ -104,4 +104,4 @@ done
 
 %files wrt
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
\ No newline at end of file
+%manifest %{name}.manifest
index 2a5ce8a..b5808b1 100755 (executable)
@@ -7,7 +7,6 @@ Group:          Application Framework/Libraries
 Source0:        %{name}-%{version}.tar.gz
 Source1001:     ail.manifest
 BuildRequires:  cmake
-BuildRequires:  vconf-keys-devel
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libsmack)
@@ -92,7 +91,8 @@ chown %TZ_SYS_GLOBALAPP_USER:root %{TZ_SYS_DB}
 chown %TZ_SYS_GLOBALAPP_USER:root %{TZ_SYS_DB}
 chown %TZ_SYS_GLOBALAPP_USER:root -R %{TZ_SYS_RW_ICONS}
 
-ail_initdb 2>/dev/null
+ail_createdb 2>/dev/null
+ail_syncdb 2>/dev/null
 chsmack -a '*' %{TZ_SYS_DB}/.app_info.db*
  
 %postun
@@ -104,6 +104,11 @@ fi
 %files
 %manifest %{name}.manifest
 %license LICENSE
+%attr(06775,root,root) %{_bindir}/ail_createdb
+%attr(0775,root,root) %{_bindir}/ail_createdb_user
+%attr(06775,root,root) %{_bindir}/ail_syncdb
+%attr(0775,root,root) %{_bindir}/ail_syncdb_user
+#obsolete tools
 %attr(06775,root,root) %{_bindir}/ail_initdb
 %attr(0775,root,root) %{_bindir}/ail_initdb_user
 %{_bindir}/ail_fota
index 258d451..a298e7c 100644 (file)
@@ -1,36 +1,36 @@
 %bcond_with x
 %bcond_with wayland
 
-Name:      app-svc
+Name:       app-svc
 Summary:    Application Service
-Version: 0.1.53
-Release:    1
+Version:    0.1.53
+Release:    0
 Group:      Application Framework/Service
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    app-svc.manifest
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires: cmake
-BuildRequires: sqlite3
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(ecore) 
+Source1001: app-svc.manifest
+
+Requires(post):     /sbin/ldconfig
+Requires(postun):   /sbin/ldconfig
+BuildRequires:      cmake
+BuildRequires:      sqlite3
+BuildRequires:      pkgconfig(dlog)
+BuildRequires:      pkgconfig(ecore)
 %if %{with x}
-BuildRequires: pkgconfig(x11)
-BuildRequires:  pkgconfig(ecore-x)
+BuildRequires:      pkgconfig(x11)
+BuildRequires:      pkgconfig(ecore-x)
 %endif
-BuildRequires: pkgconfig(libprivilege-control)
-BuildRequires: pkgconfig(bundle)
-BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(ail)
-BuildRequires: pkgconfig(xdgmime)
-BuildRequires: pkgconfig(aul)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libsoup-2.4)
-BuildRequires: pkgconfig(iniparser)
-BuildRequires: pkgconfig(pkgmgr-info)
-BuildRequires: pkgconfig(libtzplatform-config)
+BuildRequires:      pkgconfig(libprivilege-control)
+BuildRequires:      pkgconfig(bundle)
+BuildRequires:      pkgconfig(dbus-glib-1)
+BuildRequires:      pkgconfig(ail)
+BuildRequires:      pkgconfig(xdgmime)
+BuildRequires:      pkgconfig(aul)
+BuildRequires:      pkgconfig(glib-2.0)
+BuildRequires:      pkgconfig(libsoup-2.4)
+BuildRequires:      pkgconfig(iniparser)
+BuildRequires:      pkgconfig(pkgmgr-info)
+BuildRequires:      pkgconfig(libtzplatform-config)
 
 
 %description
@@ -45,6 +45,7 @@ Requires:   %{name} = %{version}-%{release}
 
 %prep
 %setup -q
+sed -i %{SOURCE1001} -e "s|TZ_SYS_DB|%TZ_SYS_DB|g"
 cp %{SOURCE1001} .
 
 %build
@@ -55,7 +56,7 @@ cp %{SOURCE1001} .
 -Dwith_x=TRUE
 %endif
 
-make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs}
 
 %install
 %make_install
@@ -64,9 +65,6 @@ make %{?jobs:-j%jobs}
 mkdir -p %{buildroot}%{TZ_SYS_DB}
 sqlite3 %{buildroot}%{TZ_SYS_DB}/.appsvc.db < data/appsvc_db.sql
 
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -77,10 +75,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %license LICENSE
 %config(noreplace) %verify(not md5 mtime size) %attr(664,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.appsvc.db
 %config(noreplace) %verify(not md5 mtime size) %attr(664,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.appsvc.db-journal
-/usr/bin/appsvc_test
+%{_bindir}/appsvc_test
 %{_libdir}/libappsvc.so.0
 %{_libdir}/libappsvc.so.0.1.0
-/usr/share/license/%{name}
 
 %files devel
 %defattr(-,root,root,-)
@@ -88,5 +85,3 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %{_libdir}/pkgconfig/appsvc.pc
 %{_libdir}/libappsvc.so
 %{_includedir}/appsvc/appsvc.h
-
-
index f183011..41e0a68 100644 (file)
@@ -5,7 +5,6 @@ Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source101:  launchpad-preload@.service
 Source102:  ac.service
 Source103:  amd_session_agent.service
 Source1001: %{name}.manifest
@@ -45,6 +44,14 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 Application utility library (devel)
 
+%package test
+Summary:    App utility test tools 
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description test
+Application utility library (test tools)
+
 
 %prep
 %setup -q
@@ -75,27 +82,24 @@ mkdir -p %{buildroot}%{TZ_SYS_DB}
 sqlite3 %{buildroot}%{TZ_SYS_DB}/.mida.db < %{buildroot}%{_datadir}/aul/mida_db.sql
 rm -rf %{buildroot}%{_datadir}/aul/mida_db.sql
 
-mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
-mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
-install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}/launchpad-preload@.service
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_unitdir_user}
 install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}/ac.service
-ln -s ../launchpad-preload@.service %{buildroot}%{_unitdir}/graphical.target.wants/launchpad-preload@5000.service
-ln -s ../ac.service %{buildroot}%{_unitdir}/graphical.target.wants/ac.service
-
 install -m 0644 %SOURCE103 %{buildroot}%{_unitdir_user}/amd_session_agent.service
-ln -s ../amd_session_agent.service %{buildroot}%{_unitdir_user}/default.target.wants/amd_session_agent.service
 
 %preun
 if [ $1 == 0 ]; then
-    systemctl stop launchpad-preload@5000.service
     systemctl stop ac.service
+    systemctl disable ac
+    systemctl --global disable amd_session_agent
 fi
 
 %post
 /sbin/ldconfig
+systemctl enable ac
+systemctl --global enable amd_session_agent
 systemctl daemon-reload
 if [ $1 == 1 ]; then
-    systemctl restart launchpad-preload@5000.service
     systemctl restart ac.service
 fi
 
@@ -109,31 +113,31 @@ systemctl daemon-reload
 %attr(0644,root,root) %{_libdir}/libaul.so.0
 %attr(0644,root,root) %{_libdir}/libaul.so.0.1.0
 %{_sysconfdir}/init.d/launchpad_run
-%attr(0755,root,root) %{_bindir}/aul_service.sh
-%attr(0755,root,root) %{_bindir}/aul_service_test.sh
 %attr(0755,root,root) %{_sysconfdir}/rc.d/rc3.d/S34launchpad_run
 %attr(0755,root,root) %{_sysconfdir}/rc.d/rc4.d/S80launchpad_run
 %config(noreplace) %attr(0644,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.mida.db
 %config(noreplace) %attr(0644,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.mida.db-journal
 %attr(0755,root,root) %{_bindir}/aul_mime.sh
 %{_bindir}/aul_test
-%{_bindir}/launch_app
-%{_bindir}/open_app
+%{_bindir}/app_launcher
 %{_bindir}/amd_session_agent
 %{_datadir}/aul/miregex/*
 %{_datadir}/aul/service/*
 %{_datadir}/aul/preload_list.txt
 %{_datadir}/aul/preexec_list.txt
-%{_unitdir}/graphical.target.wants/launchpad-preload@5000.service
-%{_unitdir}/graphical.target.wants/ac.service
-%{_unitdir}/launchpad-preload@.service
 %{_unitdir}/ac.service
 %{_unitdir_user}/amd_session_agent.service
-%{_unitdir_user}/default.target.wants/amd_session_agent.service
 %{_bindir}/amd
 %{_bindir}/daemon-manager-release-agent
 %{_bindir}/daemon-manager-launch-agent
 
+
+%files  test
+%{_bindir}/launch_app
+%{_bindir}/open_app
+%attr(0755,root,root) %{_bindir}/aul_service.sh
+%attr(0755,root,root) %{_bindir}/aul_service_test.sh
+
 %files devel
 %{_includedir}/aul/*.h
 %{_libdir}/*.so
index dc68150..21317d2 100644 (file)
@@ -1,8 +1,8 @@
-%bcond_with qt5
+%bcond_without qt5
 
 Name:       automotive-message-broker
 Summary:    Automotive Message Broker is a vehicle network abstraction system
-Version:    0.11.901
+Version:    0.13
 Release:    0
 Group:      Automotive/Service
 License:    LGPL-2.1
@@ -12,8 +12,10 @@ Requires: automotive-message-broker-plugins
 Requires: automotive-message-broker-plugins-murphy
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-
-Requires:       default-ac-domains
+Requires: default-ac-domains
+Requires: dbus-python
+Requires: python-curses
+Requires: python-gobject
 BuildRequires:  cmake
 BuildRequires:  boost-devel
 BuildRequires:  pkgconfig(json)
@@ -26,15 +28,17 @@ BuildRequires:  pkgconfig(opencv)
 BuildRequires:  murphy
 BuildRequires:  pkgconfig(murphy-glib)
 BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  doxygen
 %if %{with qt5}
 BuildRequires:  qt5-qtcore-devel
 BuildRequires:  qt5-qtconcurrent-devel
 BuildRequires:  qt5-qtdbus-devel
-BuildRequires:  qt5-qtdeclarative-devel
 BuildRequires:  qt5-qtnetwork-devel
+BuildRequires:  qt5-qtdeclarative-devel
 BuildRequires:  qt5-plugin-bearer-generic
 BuildRequires:  qt5-plugin-bearer-connman
 BuildRequires:  qt5-plugin-bearer-nm
+BuildRequires:  qt5-plugin-sqldriver-sqlite
 %endif
 
 %description
@@ -123,7 +127,7 @@ Requires:   %{name}-plugins-common = %{version}-%{release}
 OBD-II plugin that uses ELM 327-compatible scantools to access vehicle data
 
 %package plugins-wheel
-Summary:    Source plugin for using the Logitech G27 racing wheel                                        
+Summary:    Source plugin for using the Logitech G27 racing wheel
 Group:      Automotive/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -186,32 +190,54 @@ Summary:   javascript plugin engine
 Group:     Automotive/Libraries
 Requires:  %{name} = %{version}-%{release}
 Requires: qt5-qtdeclarative
+Requires: %{name}-plugins-qtmainloop
 
 %description plugins-bluemonkey
 Engine for creating scriptable plugins for AMB
+
+%package -n bluemonkey-modules-db
+Summary:   javascript plugin engine db module
+Group:     Automotive/Libraries
+Requires:  %{name} = %{version}-%{release}
+Requires: qt5-plugin-sqldriver-sqlite
+
+%description -n bluemonkey-modules-db
+Engine for creating scriptable plugins for AMB
+
 %endif
 
+%package xwalk-vehicle-extension
+Summary:  crosswalk vehicle API extension
+Group:    Automotive/Libraries
+Requires:  %{name} = %{version}-%{release}
+Requires: crosswalk
+
+%description xwalk-vehicle-extension
+Crosswalk vehicle API extension based on the W3C Automotive Business Group Vehicle and Data API Specification
+
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
 %cmake \
+          -Dxwalk_vehicle_extension=ON \
+          -DXWALK_EXTENSION_PATH=/tizen-extensions-crosswalk \
 %if %{with qt5}
-       -Dqtmainloop=ON \
-       -Dopencvlux_plugin=ON \
-       -Dwebsocket_plugin=ON \
-       -Dbluetooth_plugin=ON \
-       -Dbluemonkey_plugin=ON \
+          -Dqtmainloop=ON \
+          -Dopencvlux_plugin=ON \
+          -Dwebsocket_plugin=ON \
+          -Dbluetooth_plugin=ON \
+          -Dbluemonkey_plugin=ON \
 %endif
-       -Ddatabase_plugin=ON \
-       -Dmurphy_plugin=ON \
-       -Dobd2_plugin=ON \
-       -Dtest_plugin=ON \
-       -Dgpsnmea_plugin=ON \
-       -Dcangen_plugin=ON \
-       -Dcansim_plugin=ON \
-       -Denable_docs=ON \
-       -Dusebluez5=ON
+          -Ddatabase_plugin=ON \
+          -Dmurphy_plugin=ON \
+          -Dobd2_plugin=ON \
+          -Dtest_plugin=ON \
+          -Dgpsnmea_plugin=ON \
+          -Dcangen_plugin=ON \
+          -Dcansim_plugin=ON \
+          -Dusebluez5=ON \
+          -Denable_docs=ON
 
 
 %__make %{?jobs:-j%jobs}
@@ -225,7 +251,7 @@ cp packaging.in/ambd.service.systemd.tizen %{buildroot}%{_unitdir}/ambd.service
 ln -s ../ambd.service %{buildroot}%{_unitdir}/network.target.wants/ambd.service
 %install_service multi-user.target.wants ambd.service
 
-cp packaging.in/config.tizen %{buildroot}%{_sysconfdir}/ambd/
+cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -248,6 +274,7 @@ cp packaging.in/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %{_bindir}/amb-get-history
 %{_bindir}/amb-set
 %{_bindir}/amb-listen
+%{_bindir}/ambctl
 
 %files devel
 %defattr(-,root,root,-)
@@ -340,10 +367,22 @@ cp packaging.in/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/cansimplugin.so
 
+
 %if %{with qt5}
+
 %files plugins-bluemonkey
 %defattr(-,root,root,-)
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/bluemonkeyplugin.so
 %config %{_sysconfdir}/ambd/bluemonkey
+
+%files -n bluemonkey-modules-db
+%manifest packaging.in/amb.manifest.plugins
+%{_libdir}/%{name}/bluemonkeyDbModule.so
+
 %endif
+
+%files xwalk-vehicle-extension
+%manifest packaging.in/amb.manifest.plugins
+%{_libdir}/tizen-extensions-crosswalk/*
+%{_datadir}/%{name}/xwalk/examples/*
index 7835ebd..2de005f 100644 (file)
@@ -41,7 +41,7 @@ BuildRequires:  pkgconfig(security-server)
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(libtzplatform-config)
 
-Requires(post): vconf
+Requires(post): /usr/bin/vconftool
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -112,9 +112,7 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}%{_unitdir_user}
-mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
 install -m 0644 bt-service/bluetooth-frwk-service.service %{buildroot}%{_unitdir_user}
-ln -s ../bluetooth-frwk-service.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/bluetooth-frwk-service.service
 
 %if %{with bluetooth_frwk_libnotify} || %{with bluetooth_frwk_libnotification}
 mkdir -p %{buildroot}%{_datadir}/icons/default
@@ -128,11 +126,11 @@ sed -i 's/%TZ_SYS_DEFAULT_USER/app/' %{buildroot}%{_datadir}/dbus-1/system-servi
 
 %post
 /sbin/ldconfig
-vconftool set -tf int db/bluetooth/status "0" -g 6520
-vconftool set -tf int file/private/bt-service/flight_mode_deactivated "0" -g 6520 -i
-vconftool set -tf string memory/bluetooth/sco_headset_name "" -g 6520 -i
-vconftool set -tf int memory/bluetooth/device "0" -g 6520 -i
-vconftool set -tf int memory/bluetooth/btsco "0" -g 6520 -i
+vconftool set -f -t int db/bluetooth/status "0" -g 6520
+vconftool set -f -t int file/private/bt-service/flight_mode_deactivated "0" -g 6520 -i
+vconftool set -f -t string memory/bluetooth/sco_headset_name "" -g 6520 -i
+vconftool set -f -t int memory/bluetooth/device "0" -g 6520 -i
+vconftool set -f -t int memory/bluetooth/btsco "0" -g 6520 -i
 # set 'User' smack label to vconf keys in order to allow bt-service to access them.
 chsmack -a 'User' %TZ_SYS_CONFIG/db/bluetooth/status
 chsmack -a 'User' %TZ_SYS_CONFIG/file/private/bt-service/flight_mode_deactivated
@@ -164,7 +162,6 @@ chsmack -a 'User' %TZ_SYS_CONFIG/memory_init/memory/bluetooth/btsco
 %{_datadir}/dbus-1/system-services/org.projectx.bt.service
 
 %{_bindir}/bt-service
-%{_unitdir_user}/tizen-middleware.target.wants/bluetooth-frwk-service.service
 %{_unitdir_user}/bluetooth-frwk-service.service
 %attr(0666,-,-) /opt/var/lib/bluetooth/auto-pair-blacklist
 %{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-service.conf
index 36d1dff..1128cf4 100644 (file)
@@ -25,13 +25,16 @@ Simple string key-val dictionary ADT (devel)
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1001} .
 
+
 %build
 %cmake .
-%__make %{?_smp_mflags}
+make %{?jobs:-j%jobs}
 
 %install
 %make_install
 
+mkdir -p %{buildroot}/usr/share/license
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -43,6 +46,7 @@ cp %{SOURCE1001} .
 %{_libdir}/libbundle.so.*
 %license LICENSE
 
+
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -50,3 +54,4 @@ cp %{SOURCE1001} .
 %{_includedir}/SLP_bundle_PG.h
 %{_libdir}/pkgconfig/bundle.pc
 %{_libdir}/libbundle.so
+
diff --git a/proto-meta-Tizen_generic/specfile-initial/buxton/packaging/buxton.spec b/proto-meta-Tizen_generic/specfile-initial/buxton/packaging/buxton.spec
new file mode 100644 (file)
index 0000000..f325141
--- /dev/null
@@ -0,0 +1,143 @@
+Name:           buxton
+Version:        5
+Release:        0
+License:        LGPL-2.1+
+Summary:        A security-enabled configuration system
+Url:            https://github.com/sofar/buxton
+Group:          System/Configuration
+Source0:        %{name}-%{version}.tar.xz
+Source1:        tizen.conf
+Source1001:     %{name}.manifest
+BuildRequires:  libattr-devel
+BuildRequires:  gdbm-devel
+BuildRequires:  pkgconfig(check)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(libsystemd-daemon)
+Requires(post): buxton
+Requires(post): smack
+Requires(post): /usr/bin/chown
+
+%description
+Buxton is a security-enabled configuration management system. It
+features a layered approach to configuration storage, with each
+layer containing an arbitrary number of groups, each of which may
+contain key-value pairs.  Mandatory Access Control (MAC) is
+implemented at the group level and at the key-value level.
+
+Buxton provides a C library (libbuxton) for client applications to
+use.  Internally, buxton uses a daemon (buxtond) for processing
+client requests and enforcing MAC. Also, a CLI (buxtonctl) is
+provided for interactive use and for use in shell scripts.
+
+%package devel
+Summary: A security-enabled configuration system - development files
+Requires: %{name} = %{version}
+
+%description devel
+Buxton is a security-enabled configuration management system. It
+features a layered approach to configuration storage, with each
+layer containing an arbitrary number of groups, each of which may
+contain key-value pairs.  Mandatory Access Control (MAC) is
+implemented at the group level and at the key-value level.
+
+Buxton provides a C library (libbuxton) for client applications to
+use.  Internally, buxton uses a daemon (buxtond) for processing
+client requests and enforcing MAC. Also, a CLI (buxtonctl) is
+provided for interactive use and for use in shell scripts.
+
+This package provides development files for Buxton.
+
+%package -n buxtonsimple
+Summary: Simplified buxton API
+Requires: %{name} = %{version}
+
+%description -n buxtonsimple
+Buxton is a security-enabled configuration management system. It
+features a layered approach to configuration storage, with each
+layer containing an arbitrary number of groups, each of which may
+contain key-value pairs.  Mandatory Access Control (MAC) is
+implemented at the group level and at the key-value level.
+
+Buxton-simple provides a simplified C library (libbuxtonsimple)
+for simple client applications.
+
+%package -n buxtonsimple-devel
+Summary: Simplified buxton API - development files
+Requires: %{name} = %{version}
+
+%description -n buxtonsimple-devel
+Buxton is a security-enabled configuration management system. It
+features a layered approach to configuration storage, with each
+layer containing an arbitrary number of groups, each of which may
+contain key-value pairs.  Mandatory Access Control (MAC) is
+implemented at the group level and at the key-value level.
+
+Buxton-simple provides a simplified C library (libbuxtonsimple)
+for simple client applications.
+
+This package provides development files for BuxtonSimple.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+%make_install
+# TODO: need to define needed layers for Tizen in tizen.conf
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/buxton.conf
+
+%post
+/sbin/ldconfig
+#buxtond runs as user buxton, which much be created
+useradd buxton
+
+buxtonctl create-db base
+buxtonctl create-db isp
+if [ "$1" -eq 1 ] ; then
+    # The initial DBs will not have the correct labels and
+    # permissions when created in postinstall during image
+    # creation, so we set these file attributes here.
+    chsmack -a System %{_localstatedir}/lib/buxton/*.db
+    chown buxton:buxton %{_localstatedir}/lib/buxton/*.db
+fi
+
+%postun -p /sbin/ldconfig
+
+%docs_package
+#%license docs/LICENSE.MIT
+
+%files
+%manifest %{name}.manifest
+#%license LICENSE.LGPL2.1
+%config(noreplace) %{_sysconfdir}/buxton.conf
+%{_bindir}/buxtonctl
+%{_libdir}/buxton/*.so
+%{_libdir}/libbuxton.so.*
+%{_prefix}/lib/systemd/system/buxton.service
+%{_prefix}/lib/systemd/system/buxton.socket
+%{_prefix}/lib/systemd/system/sockets.target.wants/buxton.socket
+%{_sbindir}/buxtond
+%attr(0700,buxton,buxton) %dir %{_localstatedir}/lib/buxton
+
+%files devel
+%manifest %{name}.manifest
+%{_includedir}/buxton.h
+%{_libdir}/libbuxton.so
+%{_libdir}/pkgconfig/buxton.pc
+
+
+%files -n buxtonsimple
+%manifest %{name}.manifest
+#%license LICENSE.LGPL2.1
+%{_libdir}/libbuxtonsimple.so.*
+
+%files -n buxtonsimple-devel
+%manifest %{name}.manifest
+%{_includedir}/buxtonsimple.h
+%{_libdir}/libbuxtonsimple.so
+%{_libdir}/pkgconfig/buxtonsimple.pc
+
index 5e7ee0f..abc6343 100644 (file)
@@ -1,16 +1,15 @@
 Name:            common-crosswalk-suite
 Summary:         Crosswalk suite for Tizen Common
-Version:         1.0.0
-Release:         1
+Version:         1.1
+Release:         0
 License:         GPL-2.0
 Group:           Development/Testing
 Source:          %{name}-%{version}.tar.gz
 Source1001:      %{name}.manifest
-BuildRoot:       %{_tmppath}/%{name}-%{version}-build
+BuildArch:       noarch
 Requires:        common-suite-launcher
 Requires:        testkit-lite
 Requires:        testkit-stub
-BuildArch:       noarch
 
 
 %description
@@ -26,13 +25,13 @@ cp %{SOURCE1001} .
 
 
 %install
-install -d %{buildroot}/%{_datadir}/tests/%{name}
-install -m 0755 common/runtest.sh %{buildroot}/%{_datadir}/tests/%{name}
-install -m 0644 common/*.xml %{buildroot}/%{_datadir}/tests/%{name}
-cp -r common/TESTDIR %{buildroot}/%{_datadir}/tests/%{name}
+install -d %{buildroot}/%{_datadir}/tests/common/%{name}
+install -m 0755 runtest %{buildroot}/%{_datadir}/tests/common/%{name}
+install -m 0644 *.xml %{buildroot}/%{_datadir}/tests/common/%{name}
+cp -r TESTDIR %{buildroot}/%{_datadir}/tests/common/%{name}
 
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{_datadir}/tests/%{name}
\ No newline at end of file
+%{_datadir}/tests/common/%{name}
index 95fb85c..4a8852a 100644 (file)
@@ -1,6 +1,8 @@
 %bcond_with x
 %bcond_with wayland
 
+%ifarch x86_64 %{arm}
+### x86_64
 # NaCl build on 64bit system require libc 32bit to build the 32 IRT.
 # While Tizen 64bit image does not offer 32bit packages at all,
 # check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
@@ -9,7 +11,11 @@
 # Due to OBS build for ARM some files needed by NaCl to be build
 # are not present.
 %define _disable_nacl 1
-
+%else
+# Since M39, Google has stopped shipping a 32-bit PNaCl toolchain, so we cannot
+# build NaCl on a fully 32-bit host anymore. See XWALK-2679.
+%define _disable_nacl 1
+%endif
 
 # adjust compression algorithm to speed up RPMS creation
 # source RPM and debug RPMS are big and take too much time
 %define _binary_payload w3.gzdio
 
 Name:           crosswalk
-Version:        10.38.222.0
+Version:        11.40.277.0
 Release:        0
 Summary:        Chromium-based app runtime
 License:        (BSD-3-Clause and LGPL-2.1+)
 Group:          Web Framework/Web Run Time
 Url:            https://github.com/otcshare/crosswalk
-Source:         %{name}.tar
+Source:         %{name}.tar.gz
 Source1:        xwalk.in
 Source2:        org.crosswalkproject.Runtime1.service
 Source3:        xwalk.service.in
 Source1001:     crosswalk.manifest
 Source1002:     %{name}.xml.in
 Source1003:     %{name}.png
-Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
+Source1004:     changedate.py
 Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
 
 BuildRequires:  bison
@@ -48,6 +54,7 @@ BuildRequires:  python
 BuildRequires:  python-xml
 BuildRequires:  perl
 BuildRequires:  which
+BuildRequires:  yasm
 BuildRequires:  pkgconfig(ail)
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(appcore-common)
@@ -64,7 +71,6 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(tizen-platform-wrapper)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -74,9 +80,9 @@ BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(pkgmgr-installer)
 BuildRequires:  pkgconfig(pkgmgr-parser)
+BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(secure-storage)
 BuildRequires:  pkgconfig(sensor)
-BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(xmlsec1)
@@ -107,12 +113,27 @@ BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(xkbcommon)
 %endif
 Requires:  ca-certificates-tizen
-
+Requires:  ss-server
 BuildRequires:  crosswalk-thirdparty
 
 %description
 Crosswalk is an app runtime based on Chromium. It is an open source project started by the Intel Open Source Technology Center (http://www.01.org).
 
+%package -n widget-manifest-parser
+Summary:        Widget manifest parser library
+Requires:       %{name} = %{version}
+
+%description -n widget-manifest-parser
+A library parsing widget configuration
+
+%package -n widget-manifest-parser-devel
+Summary:        Widget manifest parser library header
+Requires:       %{name} = %{version}
+Requires:       widget-manifest-parser = %{version}
+
+%description -n widget-manifest-parser-devel
+A header for library parsing widget configuration
+
 %define _manifestdir %TZ_SYS_RO_PACKAGES
 %define _manifestdir_ro %TZ_SYS_RO_PACKAGES
 %define _desktop_icondir %TZ_SYS_RW_ICONS/default/small
@@ -128,16 +149,19 @@ cp %{SOURCE3} .
 cp %{SOURCE1001} .
 cp %{SOURCE1002} .
 cp %{SOURCE1003} .
+cp %{SOURCE1004} .
 sed "s/@VERSION@/%{version}/g" %{name}.xml.in > %{name}.xml
 sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.in > xwalk
 sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.service.in > xwalk.service
 
+# Widget manifest parser devel
+cp src/xwalk/tizen/widget-manifest-parser/widget-manifest-parser.pc.in .
+sed "s|@VERSION@|%{version}|g" widget-manifest-parser.pc.in > widget-manifest-parser.pc
+
 cp -a src/AUTHORS AUTHORS.chromium
 cp -a src/LICENSE LICENSE.chromium
 cp -a src/xwalk/LICENSE LICENSE.xwalk
 
-%patch9
-
 # The profiles using Wayland (and thus Ozone) do not need this patch.
 %if !%{with wayland}
 %patch10
@@ -146,10 +170,8 @@ cp -a src/xwalk/LICENSE LICENSE.xwalk
 %build
 
 mkdir -p src/out
-if [ -f ${prefix}/share/crosswalk-thirdparty/out.tgz ]; then
-  tar -zxvf %{_datadir}/crosswalk-thirdparty/out.tgz
-fi
-find . -exec touch -a -m -t "200912120000" {} \;
+tar -zxvf %{_datadir}/crosswalk-thirdparty/out.tgz
+python ./changedate.py
 
 # Stop unconditionally passing -Wall to the compiler. Chromium has its own
 # mechanisms for deciding which parts of the code need -Wall and which need it
@@ -192,13 +214,13 @@ if [ -n "${BUILDDIR_NAME}" ]; then
 fi
 
 %if %{with wayland}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_xdg_shell=1"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
 %endif
 
-# Force gold binary from chroot ld.gold provided by binutils-gold
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl} -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
+# disable nacl if necessary
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"
 
-# Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
+# Linking fails when fatal ld warnings are enabled. See XWALK-1379.
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
 
 # For building for arm in OBS, we need :
@@ -215,6 +237,10 @@ export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 %endif
 
+%ifarch aarch64
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dtarget_arch=arm64 -Duse_allocator=none "
+%endif
+
 %if "%{profile}" == "ivi"
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
 %endif
@@ -227,6 +253,8 @@ export GYP_GENERATORS='ninja'
 ${GYP_EXTRA_FLAGS} \
 -Dchromeos=0 \
 -Dclang=0 \
+-Dlinux_use_bundled_binutils=0 \
+-Dlinux_use_bundled_gold=0 \
 -Dtizen=1 \
 -Dpython_ver=2.7 \
 -Duse_aura=1 \
@@ -238,10 +266,13 @@ ${GYP_EXTRA_FLAGS} \
 -Duse_system_libexif=1 \
 -Duse_system_libxml=1 \
 -Duse_system_nspr=1 \
+-Duse_system_yasm=1 \
 -Dshared_process_mode=1 \
--Denable_hidpi=1
+-Denable_hidpi=1 \
+-Dwerror= \
+-Dskia_warnings_as_errors=0
 
-ninja %{?_smp_mflags} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools
+ninja %{?_smp_mflags} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools widget-manifest-parser
 
 %install
 # Binaries.
@@ -250,8 +281,8 @@ install -p -D xwalk.service %{buildroot}%{_systemduserservicedir}/xwalk.service
 install -p -D src/out/Release/xwalk %{buildroot}%{_libdir}/xwalk/xwalk
 install -p -D src/out/Release/xwalkctl %{buildroot}%{_bindir}/xwalkctl
 install -p -D src/out/Release/xwalk-launcher %{buildroot}%{_bindir}/xwalk-launcher
-install -p -D src/out/Release/lib/libxwalk-backendlib.so %{buildroot}%{_libdir}/xwalk/libxwalk-backendlib.so
-install -p -D src/xwalk/application/tools/tizen/xwalk_backend_wrapper.sh %{buildroot}%{_libdir}/xwalk/xwalk_backend_wrapper.sh
+install -p -D src/out/Release/xwalk_backend %{buildroot}%{_libdir}/xwalk/xwalk_backend
+install -p -D src/out/Release/lib/libxwalk_backend_lib.so %{buildroot}%{_libdir}/xwalk/libxwalk_backend_lib.so
 
 # Supporting libraries and resources.
 install -p -D src/out/Release/icudtl.dat %{buildroot}%{_libdir}/xwalk/icudtl.dat
@@ -271,17 +302,24 @@ install -m 0664 -p -D src/out/Release/pnacl/* %{buildroot}%{_libdir}/xwalk/pnacl
 %endif
 
 # Register xwalk to the package manager.
-install -p -D %{name}.xml %{buildroot}%{_manifestdir}/%{name}.xml
-install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{name}.png
+install -m 0644 -p -D %{name}.xml %{buildroot}%{_manifestdir}/%{name}.xml
+install -m 0644 -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{name}.png
+
+# Widget manifest parser devel
+install -m 0664 -p -D src/xwalk/tizen/widget-manifest-parser/widget-manifest-parser.h %{buildroot}%{_includedir}/widget-manifest-parser/widget-manifest-parser.h
+install -m 0664 -p -D widget-manifest-parser.pc %{buildroot}%{_libdir}/pkgconfig/widget-manifest-parser.pc
+
+# Widget manifest parser
+install -m 0755 -p -D src/out/Release/lib/libwidget-manifest-parser.so %{buildroot}%{_libdir}/libwidget-manifest-parser.so
 
 %post
 mkdir -p %{_desktop_icondir_ro}
 mkdir -p %{_manifestdir_ro}
 
-ln -sf %{_libdir}/xwalk/libxwalk-backendlib.so /etc/package-manager/backendlib/libxpk.so
-ln -sf %{_libdir}/xwalk/libxwalk-backendlib.so /etc/package-manager/backendlib/libwgt.so
-ln -sf %{_libdir}/xwalk/xwalk_backend_wrapper.sh /etc/package-manager/backend/xpk
-ln -sf %{_libdir}/xwalk/xwalk_backend_wrapper.sh /etc/package-manager/backend/wgt
+ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libxpk.so
+ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libwgt.so
+ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/xpk
+ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/wgt
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -308,10 +346,17 @@ fi
 %endif
 %{_libdir}/xwalk/xwalk
 %{_libdir}/xwalk/xwalk.pak
-%{_libdir}/xwalk/libxwalk-backendlib.so
-%{_libdir}/xwalk/xwalk_backend_wrapper.sh
+%{_libdir}/xwalk/libxwalk_backend_lib.so
+%{_libdir}/xwalk/xwalk_backend
 %{_manifestdir}/%{name}.xml
 %{_desktop_icondir}/%{name}.png
 %{_dbusservicedir}/org.crosswalkproject.Runtime1.service
 %{_systemduserservicedir}/xwalk.service
 %{_datadir}/xwalk/*
+
+%files -n widget-manifest-parser
+%{_libdir}/libwidget-manifest-parser.so
+
+%files -n widget-manifest-parser-devel
+%{_includedir}/widget-manifest-parser/widget-manifest-parser.h
+%{_libdir}/pkgconfig/widget-manifest-parser.pc
index 9f8cf6f..3bbea3a 100644 (file)
@@ -4,6 +4,9 @@
 %define debug_package %{nil}
 %define __debug_install_post %{nil}
 
+%ifarch x86_64 %{arm}
+### x86_64
+
 # NaCl build on 64bit system require libc 32bit to build the 32 IRT.
 # While Tizen 64bit image does not offer 32bit packages at all,
 # check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
 # Due to OBS build for ARM some files needed by NaCl to be build
 # are not present.
 %define _disable_nacl 1
-
+%else
+# Since M39, Google has stopped shipping a 32-bit PNaCl toolchain, so we cannot
+# build NaCl on a fully 32-bit host anymore. See XWALK-2679.
+%define _disable_nacl 1
+%endif
 
 # adjust compression algorithm to speed up RPMS creation
 # source RPM and debug RPMS are big and take too much time
 %define _binary_payload w3.gzdio
 
 Name:           crosswalk-thirdparty
-Version:        10.38.222.0
+Version:        11.40.277.0
 Release:        0
 Summary:        Chromium-based app runtime
 License:        (BSD-3-Clause and LGPL-2.1+)
 Group:          Web Framework/Web Run Time
 Url:            https://github.com/otcshare/crosswalk
-Source:         crosswalk.tar
+Source:         crosswalk.tar.gz
 Source1001:     crosswalk-thirdparty.manifest
 Source1002:     xwalk-thirdparty.gyp
-Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
 Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
 NoSource:       0
 
@@ -48,6 +54,7 @@ BuildRequires:  python
 BuildRequires:  python-xml
 BuildRequires:  perl
 BuildRequires:  which
+BuildRequires:  yasm
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(dbus-1)
@@ -59,6 +66,17 @@ BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(protobuf)
+Requires:  ca-certificates-tizen
+Requires:  ss-server
+
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(xkbcommon)
+%endif
+
 BuildRequires:  pkgconfig(nss)
 %if %{with x}
 BuildRequires:  pkgconfig(x11)
@@ -80,14 +98,6 @@ BuildRequires:  pkgconfig(murphy-common)
 BuildRequires:  pkgconfig(murphy-resource)
 %endif
 
-%if %{with wayland}
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-cursor)
-BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(xkbcommon)
-%endif
-Requires:  ca-certificates-tizen
-
 AutoProv:       0
 Provides:       crosswalk-thirdparty
 
@@ -104,15 +114,15 @@ cp %{SOURCE1001} .
 cp %{SOURCE1002} src/xwalk/
 
 
-%patch9
-
 # The profiles using Wayland (and thus Ozone) do not need this patch.
 %if !%{with wayland}
 %patch10
 %endif
 
+
 %build
 
+
 # Stop unconditionally passing -Wall to the compiler. Chromium has its own
 # mechanisms for deciding which parts of the code need -Wall and which need it
 # to be left out (since several pieces are built with -Werror). At least in
@@ -120,6 +130,12 @@ cp %{SOURCE1002} src/xwalk/
 # does not expect -Wall to be passed to the compiler (see webrtc issue 3307).
 export CXXFLAGS=`echo $CXXFLAGS | sed s,-Wall,,g`
 
+# Do not use -finline-functions: it breaks the build because it causes -Wall to
+# warn about some conditions that cannot really be reached (ie. variables that
+# may be used uninitialized while in fact thay cannot be uninitialized). See
+# TC-2299.
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-finline-functions,,g`
+
 # For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
 # src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's
 # CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246
@@ -154,13 +170,13 @@ if [ -n "${BUILDDIR_NAME}" ]; then
 fi
 
 %if %{with wayland}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_xdg_shell=1"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
 %endif
 
-# Force gold binary from chroot ld.gold provided by binutils-gold
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl} -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
+# disable nacl if necessary
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"
 
-# Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
+# Linking fails when fatal ld warnings are enabled. See XWALK-1379.
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
 
 # For building for arm in OBS, we need :
@@ -177,10 +193,15 @@ export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 %endif
 
+%ifarch aarch64
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dtarget_arch=arm64 -Duse_allocator=none "
+%endif
+
 %if "%{profile}" == "ivi"
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
 %endif
 
+
 # --no-parallel is added because chroot does not mount a /dev/shm, this will
 # cause python multiprocessing.SemLock error.
 export GYP_GENERATORS='ninja'
@@ -189,6 +210,8 @@ export GYP_GENERATORS='ninja'
 ${GYP_EXTRA_FLAGS} \
 -Dchromeos=0 \
 -Dclang=0 \
+-Dlinux_use_bundled_binutils=0 \
+-Dlinux_use_bundled_gold=0 \
 -Dtizen=1 \
 -Dpython_ver=2.7 \
 -Duse_aura=1 \
@@ -199,14 +222,17 @@ ${GYP_EXTRA_FLAGS} \
 -Duse_system_bzip2=1 \
 -Duse_system_libexif=1 \
 -Duse_system_libxml=1 \
--Duse_system_nspr=1 \
--Dshared_process_mode=1 \
--Denable_hidpi=1
+-Duse_system_protobuf=1 \
+-Duse_system_yasm=1 \
+-Denable_hidpi=1 \
+-Dwerror= \
+-Dskia_warnings_as_errors=0
 
 ninja %{?_smp_mflags} -C src/out/Release xwalk-thirdparty
 
 %install
 
+
 mkdir  -p %{buildroot}/%{_datadir}/crosswalk-thirdparty/
 tar -zcvf out.tgz src/out
 cp -ar out.tgz %{buildroot}/%{_datadir}/crosswalk-thirdparty/
diff --git a/proto-meta-Tizen_generic/specfile-initial/cynara/packaging/cynara.spec b/proto-meta-Tizen_generic/specfile-initial/cynara/packaging/cynara.spec
new file mode 100644 (file)
index 0000000..91b80a6
--- /dev/null
@@ -0,0 +1,360 @@
+Name:       cynara
+Summary:    Cynara service with client libraries
+Version:    0.4.2
+Release:    1
+Group:      Security/Application Privilege
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1000:    %{name}-rpmlintrc
+Source1001:    cynara.manifest
+Source1002:    libcynara-client.manifest
+Source1003:    libcynara-admin.manifest
+Source1004:    cynara-tests.manifest
+Source1005:    libcynara-agent.manifest
+Source1006:    libcynara-commons.manifest
+Source1007:    libcynara-creds-commons.manifest
+Source1008:    libcynara-creds-dbus.manifest
+Source1009:    libcynara-creds-socket.manifest
+Source1010:    libcynara-session.manifest
+Source1011:    cynara-db-migration.manifest
+Requires:      default-ac-domains
+Requires(pre): pwdutils
+Requires(pre): cynara-db-migration >= %{version}-%{release}
+Requires(post):   smack
+Requires(postun): pwdutils
+Requires(postun): cynara-db-migration >= %{version}-%{release}
+BuildRequires: cmake
+BuildRequires: zip
+BuildRequires: pkgconfig(libsystemd-daemon)
+BuildRequires: pkgconfig(libsystemd-journal)
+%{?systemd_requires}
+
+%global user_name %{name}
+%global group_name %{name}
+
+%global state_path %{_localstatedir}/%{name}/
+%global lib_path %{_libdir}/%{name}/
+%global tests_dir %{_datarootdir}/%{name}/tests/
+%global conf_path %{_sysconfdir}/%{name}/
+
+%if !%{defined build_type}
+%define build_type RELEASE
+%endif
+
+%if %{?build_type} == "DEBUG"
+
+BuildRequires: libdw-devel
+BuildRequires: pkgconfig(libunwind)
+
+%endif
+
+%description
+service, client libraries (libcynara-client, libcynara-admin),
+agent library, helper libraries (libcynara-session, libcynara-creds-common, libcynara-creds-dbus,
+libcynara-creds-socket) and tests (cynara-tests)
+
+%package devel
+Summary:    Cynara development files
+Requires:   libcynara-admin = %{version}-%{release}
+Requires:   libcynara-agent = %{version}-%{release}
+Requires:   libcynara-client = %{version}-%{release}
+Requires:   libcynara-commons = %{version}-%{release}
+Requires:   libcynara-creds-commons = %{version}-%{release}
+Requires:   libcynara-creds-dbus = %{version}-%{release}
+Requires:   libcynara-creds-socket = %{version}-%{release}
+Requires:   libcynara-session = %{version}-%{release}
+Requires:   pkgconfig(dbus-1)
+Obsoletes:  libcynara-admin-devel
+Obsoletes:  libcynara-agent-devel
+Obsoletes:  libcynara-client-async-devel
+Obsoletes:  libcynara-client-commons-devel
+Obsoletes:  libcynara-client-devel
+Obsoletes:  libcynara-commons-devel
+Obsoletes:  libcynara-creds-commons-devel
+Obsoletes:  libcynara-creds-dbus-devel
+Obsoletes:  libcynara-creds-socket-devel
+Obsoletes:  libcynara-plugin-devel
+Obsoletes:  libcynara-session-devel
+Obsoletes:  libcynara-storage-devel
+
+%description devel
+Cynara development files
+
+%package tests
+Summary:    Cynara - cynara test binaries
+BuildRequires: pkgconfig(gmock)
+
+%description tests
+Cynara tests
+
+%package -n libcynara-client
+Summary:    Cynara - client libraries
+Requires:   cynara = %{version}-%{release}
+Obsoletes:  libcynara-client-commons
+Obsoletes:  libcynara-client-async
+
+%description -n libcynara-client
+Client libraries for checking policies: synchronous and asynchronous
+
+%package -n libcynara-admin
+Summary:    Cynara - admin client library
+Requires:   cynara = %{version}-%{release}
+
+%description -n libcynara-admin
+admin client library for setting, listing and removing policies
+
+%package -n libcynara-agent
+Summary:    Cynara - agent client library
+Requires:   cynara = %{version}-%{release}
+
+%description -n libcynara-agent
+agent client library for communication with cynara service and plugins
+
+%package -n libcynara-commons
+Summary:    Cynara - cynara commons library
+Obsoletes:  libcynara-storage
+
+%description -n libcynara-commons
+cynara common library with common functionalities
+
+%package -n libcynara-creds-commons
+Summary:    Base library for cynara credentials helpers
+
+%description -n libcynara-creds-commons
+Base library for cynara credentials helpers
+
+%package -n libcynara-creds-dbus
+Summary:    Cynara credentials helpers library for dbus clients
+BuildRequires: pkgconfig(dbus-1)
+Requires:   dbus
+
+%description -n libcynara-creds-dbus
+Cynara credentials helpers library for dbus clients
+
+%package -n libcynara-creds-socket
+Summary:    Cynara credentials helpers library for socket clients
+
+%description -n libcynara-creds-socket
+Cynara credentials helpers library for socket clients
+
+%package -n libcynara-session
+Summary:    Cynara helper client session string creation library
+
+%description -n libcynara-session
+Cynara helper client session string creation library
+
+%package -n cynara-db-migration
+Summary:    Migration tools for Cynara's database
+
+%description -n cynara-db-migration
+Migration tools for Cynara's database
+
+%prep
+%setup -q
+cp -a %{SOURCE1001} .
+cp -a %{SOURCE1002} .
+cp -a %{SOURCE1003} .
+cp -a %{SOURCE1004} .
+cp -a %{SOURCE1005} .
+cp -a %{SOURCE1006} .
+cp -a %{SOURCE1007} .
+cp -a %{SOURCE1008} .
+cp -a %{SOURCE1009} .
+cp -a %{SOURCE1010} .
+cp -a %{SOURCE1011} .
+cp -a test/db/db* .
+
+%build
+%if 0%{?sec_build_binary_debug_enable}
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+%endif
+
+%if %{?build_type} == "DEBUG"
+export CXXFLAGS="$CXXFLAGS -Wp,-U_FORTIFY_SOURCE"
+%endif
+
+export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"%{state_path}\\\" \
+                           -DCYNARA_LIB_PATH=\\\"%{lib_path}\\\" \
+                           -DCYNARA_TESTS_DIR=\\\"%{tests_dir}\\\" \
+                           -DCYNARA_CONFIGURATION_DIR=\\\"%{conf_path}\\\""
+export LDFLAGS+="-Wl,--rpath=%{_libdir}"
+
+%cmake . \
+        -DBUILD_TESTS=ON \
+        -DCMAKE_BUILD_TYPE=%{?build_type} \
+        -DCMAKE_VERBOSE_MAKEFILE=ON
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+mkdir -p %{buildroot}/%{conf_path}
+cp ./conf/creds.conf %{buildroot}/%{conf_path}/creds.conf
+
+mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants
+mkdir -p %{buildroot}/%{state_path}
+mkdir -p %{buildroot}/%{tests_dir}/empty_db
+mkdir -p %{buildroot}/%{lib_path}/plugin/client
+mkdir -p %{buildroot}/%{lib_path}/plugin/service
+
+cp -a db* %{buildroot}/%{tests_dir}
+ln -s ../cynara.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/cynara.socket
+ln -s ../cynara-admin.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/cynara-admin.socket
+ln -s ../cynara-agent.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/cynara-agent.socket
+
+%pre
+id -g %{group_name} > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+    groupadd %{group_name} -r > /dev/null 2>&1
+fi
+
+id -u %{user_name} > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+    useradd -d /var/lib/empty -s /sbin/nologin -r -g %{group_name} %{user_name} > /dev/null 2>&1
+fi
+
+if [ $1 -gt 1 ] ; then
+    OLDVERSION="$(rpm -q --qf '%%{version}' %{name})"
+    %{_sbindir}/cynara/cynara-db-migration.sh upgrade -f ${OLDVERSION} -t %{version}
+else
+    %{_sbindir}/cynara/cynara-db-migration.sh install -t %{version}
+fi
+
+%post
+### Add file capabilities if needed
+### setcap/getcap binary are useful. To use them you must install libcap and libcap-tools packages
+### In such case uncomment Requires with those packages
+
+systemctl daemon-reload
+
+if [ $1 = 1 ]; then
+    systemctl enable %{name}.service
+fi
+
+chsmack -a System %{state_path}
+
+systemctl restart %{name}.service
+
+%preun
+if [ $1 = 0 ]; then
+    # unistall
+    systemctl stop cynara.service
+fi
+
+%postun
+if [ $1 = 0 ]; then
+    %{_sbindir}/cynara/cynara-db-migration.sh uninstall -f %{version}
+    userdel -r %{user_name} > /dev/null 2>&1
+    groupdel %{user_name} > /dev/null 2>&1
+    systemctl daemon-reload
+fi
+
+%post -n libcynara-client -p /sbin/ldconfig
+
+%postun -n libcynara-client -p /sbin/ldconfig
+
+%post -n libcynara-admin -p /sbin/ldconfig
+
+%postun -n libcynara-admin -p /sbin/ldconfig
+
+%post -n libcynara-agent -p /sbin/ldconfig
+
+%postun -n libcynara-agent -p /sbin/ldconfig
+
+%post -n libcynara-commons -p /sbin/ldconfig
+
+%postun -n libcynara-commons -p /sbin/ldconfig
+
+%post -n libcynara-creds-commons -p /sbin/ldconfig
+
+%postun -n libcynara-creds-commons -p /sbin/ldconfig
+
+%post -n libcynara-creds-dbus -p /sbin/ldconfig
+
+%postun -n libcynara-creds-dbus -p /sbin/ldconfig
+
+%post -n libcynara-creds-socket -p /sbin/ldconfig
+
+%postun -n libcynara-creds-socket -p /sbin/ldconfig
+
+%post -n libcynara-session -p /sbin/ldconfig
+
+%postun -n libcynara-session -p /sbin/ldconfig
+
+%files
+%manifest cynara.manifest
+%license LICENSE
+%attr(755,root,root) /usr/bin/cynara
+%attr(-,root,root) /usr/lib/systemd/system/cynara.service
+%attr(-,root,root) /usr/lib/systemd/system/cynara.target
+%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/cynara.socket
+%attr(-,root,root) /usr/lib/systemd/system/cynara.socket
+%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/cynara-admin.socket
+%attr(-,root,root) /usr/lib/systemd/system/cynara-admin.socket
+%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/cynara-agent.socket
+%attr(-,root,root) /usr/lib/systemd/system/cynara-agent.socket
+%dir %attr(700,cynara,cynara) %{state_path}
+%dir %attr(755,cynara,cynara) %{lib_path}/plugin/service
+
+%files -n cynara-devel
+%{_includedir}/cynara/*.h
+%{_includedir}/cynara/plugin/*.h
+%{_includedir}/cynara/types/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+
+%files -n cynara-tests
+%manifest cynara-tests.manifest
+%attr(755,root,root) /usr/bin/cynara-tests
+%attr(755,root,root) %{tests_dir}/db*/*
+%dir %attr(755,root,root) %{tests_dir}/empty_db
+
+%files -n libcynara-client
+%manifest libcynara-client.manifest
+%license LICENSE
+%{_libdir}/libcynara-client.so.*
+%{_libdir}/libcynara-client-async.so.*
+%{_libdir}/libcynara-client-commons.so.*
+%dir %attr(755,cynara,cynara) %{lib_path}/plugin/client
+
+%files -n libcynara-admin
+%manifest libcynara-admin.manifest
+%license LICENSE
+%{_libdir}/libcynara-admin.so.*
+
+%files -n libcynara-agent
+%manifest libcynara-agent.manifest
+%license LICENSE
+%{_libdir}/libcynara-agent.so.*
+
+%files -n libcynara-commons
+%manifest libcynara-commons.manifest
+%license LICENSE
+%{_libdir}/libcynara-commons.so.*
+%{_libdir}/libcynara-storage.so.*
+
+%files -n libcynara-creds-commons
+%manifest libcynara-creds-commons.manifest
+%license LICENSE
+%{_libdir}/libcynara-creds-commons.so.*
+%{conf_path}creds.conf
+
+%files -n libcynara-creds-dbus
+%manifest libcynara-creds-dbus.manifest
+%license LICENSE
+%{_libdir}/libcynara-creds-dbus.so.*
+
+%files -n libcynara-creds-socket
+%manifest libcynara-creds-socket.manifest
+%license LICENSE
+%{_libdir}/libcynara-creds-socket.so.*
+
+%files -n libcynara-session
+%manifest libcynara-session.manifest
+%license LICENSE
+%{_libdir}/libcynara-session.so.*
+
+%files -n cynara-db-migration
+%manifest cynara-db-migration.manifest
+%attr(744,root,root) %{_sbindir}/cynara/cynara-db-migration.sh
index 5d8379d..904c8a0 100644 (file)
@@ -1,5 +1,5 @@
 Name:           dbus-python
-Version:        1.1.1
+Version:        1.2.0
 Release:        0
 Summary:        Python bindings for D-Bus
 License:        MIT
@@ -8,7 +8,6 @@ Url:            http://www.freedesktop.org/wiki/Software/DBusBindings/
 Source0:        http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
 Source1001:     dbus-python.manifest
 BuildRequires:  fdupes
-BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -27,7 +26,7 @@ Developer files for Python bindings for D-Bus.
 
 
 %prep
-%setup -q 
+%setup -q
 cp %{SOURCE1001} .
 
 %build
@@ -35,7 +34,6 @@ export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing -fPIC"
 %reconfigure --docdir=%{_docdir}/dbus-python
 %__make %{?_smp_mflags}
 
-
 %install
 %make_install
 
index c873b85..bfd7686 100644 (file)
@@ -1,15 +1,10 @@
-Name:           desktop-skin
-Summary:        Desktop skin for Tizen:Common
-Version:        2.0
-Group:          Applications/Multimedia
-License:        GPL-2.0+
-Release:        0
+Name:          desktop-skin
+Summary:       Desktop skin for Tizen:Common
+Version:       2.0
+Group:                 Applications/Multimedia
+License:    GPL-2.0+
+Release:       1
 Source0:        %{name}-%{version}.tar.gz
-Source1001:     %{name}.manifest
-
-Requires:       python-cairo
-
-BuildArchitectures: noarch
 
 %description
 Provides desktop visuals and test programs
@@ -20,7 +15,6 @@ Provides desktop visuals and test programs
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
 
 %build
 
@@ -28,7 +22,6 @@ cp %{SOURCE1001} .
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 Script/launch_cam.sh %{buildroot}%{_bindir}
 install -m 755 Script/launch_video.sh %{buildroot}%{_bindir}
-install -m 755 Script/mark_image.py %{buildroot}%{_bindir}
 install -m 755 Script/wifi %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/media/videos
@@ -48,10 +41,9 @@ install -m 644  backgrounds/tizen/golfe-morbihan.jpg %{buildroot}%{_datadir}/bac
 install -m 644  backgrounds/tizen/tizen_common.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common.png
 
 %post
-ln -sf tizen_common.png %{_datadir}/backgrounds/tizen/current
+ln -s tizen_common.png %{_datadir}/backgrounds/tizen/current
 
 %files
-%manifest %{name}.manifest
 %{_bindir}/*
 %{_datadir}/media/videos/AmazingNature_480p.mp4
 %{_datadir}/media/photos/*
index 7178098..b3b0b43 100755 (executable)
@@ -83,9 +83,9 @@ LDFLAGS="${LDFLAGS} -Wl,--as-needed -Wl,--hash-style=both"; export LDFLAGS
 %install
 %make_install
 mkdir -p %{buildroot}/%{_data_install_path}
-mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
+mkdir -p %{buildroot}%{_unitdir}/default.target.wants
 mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
-ln -s ../download-provider.service %{buildroot}%{_unitdir}/graphical.target.wants/
+ln -s ../download-provider.service %{buildroot}%{_unitdir}/default.target.wants/
 ln -s ../download-provider.socket %{buildroot}%{_unitdir}/sockets.target.wants/
 
 %find_lang %{name}
@@ -115,7 +115,7 @@ vconftool set -t int db/setting/default_memory/wap 0
 %{_libdir}/libdownloadagent2.so*
 %{_libdir}/libdownload-provider-interface.so*
 %{_unitdir}/download-provider.service
-%{_unitdir}/graphical.target.wants/download-provider.service
+%{_unitdir}/default.target.wants/download-provider.service
 %{_unitdir}/download-provider.socket
 %{_unitdir}/sockets.target.wants/download-provider.socket
 %{_sqlschemafile}
index fa02588..495556f 100644 (file)
@@ -13,9 +13,10 @@ License: LGPL-2.1+ and GPL-2.0+
 Source: %{name}-%{version}.tar.gz
 URL: https://01.org/gsso
 Source1001: %{name}.manifest
+Source1002: gsignond-cleandb
 Provides: gsignon
 %if %{dbus_type} != "p2p"
-Requires: dbus-1
+BuildRequires: dbus-1
 %endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -51,8 +52,10 @@ Requires:   %{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1001} .
+cp %{SOURCE1002} .
 
 %build
+autoreconf -ivf
 %if %{debug_build} == 1
 %configure --enable-dbus-type=%{dbus_type} --enable-debug
 %else
@@ -66,8 +69,10 @@ rm -rf %{buildroot}
 %make_install
 install -m 755 -d %{buildroot}%{_unitdir_user}
 install -m 644 data/gsignond.service %{buildroot}%{_unitdir_user}/
-install -m 755 -d %{buildroot}%{_unitdir_user}/weston.target.wants
-ln -s ../gsignond.service %{buildroot}%{_unitdir_user}/weston.target.wants/gsignond.service
+install -m 755 -d %{buildroot}%{_unitdir_user}/default.target.wants
+ln -sf ../gsignond.service %{buildroot}%{_unitdir_user}/default.target.wants/gsignond.service
+install -m 755 -d %{buildroot}%{_sysconfdir}/gumd/userdel.d/
+install -m 755 gsignond-cleandb %{buildroot}%{_sysconfdir}/gumd/userdel.d/
 
 %post
 /sbin/ldconfig
@@ -79,7 +84,7 @@ getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%doc AUTHORS COPYING.LIB INSTALL NEWS README
+%doc AUTHORS COPYING.LIB
 %{_bindir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
 %{_libdir}/%{name}/extensions/*.so*
@@ -89,8 +94,9 @@ getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 %{_datadir}/dbus-1/services/*SingleSignOn*.service
 %endif
 %{_unitdir_user}/gsignond.service
-%{_unitdir_user}/weston.target.wants/gsignond.service
+%{_unitdir_user}/default.target.wants/gsignond.service
 %config(noreplace) %{_sysconfdir}/gsignond.conf
+%{_sysconfdir}/gumd/userdel.d/
 
 %files devel
 %defattr(-,root,root,-)
index e552147..8a4ed6b 100644 (file)
@@ -104,12 +104,6 @@ install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.xml %{buildroot}%{
 # install tizen package metadata for weston-terminal
 install -m 0644 ico-app-miscellaneous/terminal.xml %{buildroot}%{_datadir}/packages/
 
-# install browser package metadata for MiniBrowser
-mkdir -p %{buildroot}%{_bindir}
-install -m 0644 ico-app-miscellaneous/browser.xml %{buildroot}%{_datadir}/packages/
-install -m 0644 ico-app-miscellaneous/browser.png %{buildroot}%{_datadir}/icons/default/small/
-install -m 0755 ico-app-miscellaneous/browser %{buildroot}%{_bindir}
-
 # install tizen package metadata for weekeyboard
 install -m 0644 ico-app-miscellaneous/weekeyboard.xml %{buildroot}%{_datadir}/packages/
 
@@ -131,7 +125,6 @@ if [ "$1" = "0" ]; then
 /sbin/ldconfig
 rm -f %{_datadir}/applications/org.tizen.ico.app-soundsample.desktop
 rm -f %{_datadir}/applications/org.tizen.ico.app-vicsample.desktop
-rm -f %{_datadir}/applications/browser.desktop
 rm -f %{_datadir}/applications/terminal.desktop
 rm -f %{_datadir}/icons/default/small/terminal.png
 # Update the app database.
@@ -158,10 +151,7 @@ fi
 %{_datadir}/packages/org.tizen.ico.app-vicsample.xml
 
 # files(ico-app-miscellaneous)
-%{_bindir}/browser
-%{_datadir}/packages/browser.xml
 %{_datadir}/packages/terminal.xml
 %{_datadir}/packages/navigator.xml
 %{_datadir}/packages/weekeyboard.xml
-%{_datadir}/icons/default/small/browser.png
 %{_datadir}/icons/default/small/navigator.png
index 0511079..1f5364e 100644 (file)
@@ -1,6 +1,6 @@
 Name:       ico-uxf-homescreen
 Summary:    Sample homescreen and system controller
-Version:    0.9.22
+Version:    0.9.23
 Release:    0
 Group:      Automotive/ICO Homescreen
 License:    Apache-2.0
@@ -47,27 +47,13 @@ Requires: ico-uxf-weston-plugin >= 0.9.21
 Requires: ico-uxf-utilities >= 0.9.07
 Requires: system-controller
 
+Requires(post): pkgmgr
+Requires(post): ail
+
 %description
 This package provides the sample homescreen application.
 
 
-%package system-controller
-Summary: System controller for ICO HomeScreen
-Group:   Automotive/ICO Homescreen
-Requires: %{name} = %{version}-%{release}
-Requires: weston >= 1.4
-Requires: weston-ivi-shell
-Requires: genivi-shell
-Requires: ico-uxf-weston-plugin >= 0.9.21
-Requires: ico-uxf-utilities >= 0.9.07
-Provides: system-controller
-Conflicts: murphy-system-controller
-
-%description system-controller
-A service to provide the low-level functionality that ICO HomeScreen
-requires.
-
-
 %package system-controller-devel
 Summary:  Development files for %{name}
 Group:    Automotive/ICO Homescreen
@@ -130,7 +116,6 @@ ail_initdb
 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
 pkg_initdb
 ail_initdb
 
@@ -144,7 +129,6 @@ ail_initdb
 %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.statusbar.xml
 %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.onscreen.xml
 %{_libdir}/libico-appfw.*
-%{_libdir}/libico-state-machine.*
 %{_bindir}/ico_clear_screen
 %{_bindir}/ico_change_loginuser
 %{_bindir}/ico_del_notification
@@ -154,18 +138,8 @@ ail_initdb
 %{_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
-%TZ_SYS_RW_APP/org.tizen.ico.system-controller/res/config
-
-%files system-controller
-%defattr(-,root,root,-)
-%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
+# retain the system control configuration inside homescreen at least for now
+%{TZ_SYS_RW_APP}/org.tizen.ico.system-controller/res/config
 
 %files system-controller-devel
 %defattr(-,root,root,-)
@@ -175,18 +149,13 @@ ail_initdb
 %{_includedir}/ico-appfw/ico_syc_common.h
 %{_includedir}/ico-appfw/ico_syc_error.h
 %{_includedir}/ico-appfw/ico_syc_inputctl.h
+%{_includedir}/ico-appfw/ico_syc_msg.h
+%{_includedir}/ico-appfw/ico_syc_msg_cmd_def.h
 %{_includedir}/ico-appfw/ico_syc_private.h
 %{_includedir}/ico-appfw/ico_syc_privilege.h
+%{_includedir}/ico-appfw/ico_syc_public.h
+%{_includedir}/ico-appfw/ico_syc_sysdef.h
 %{_includedir}/ico-appfw/ico_syc_type.h
 %{_includedir}/ico-appfw/ico_syc_userctl.h
 %{_includedir}/ico-appfw/ico_syc_winctl.h
-%{_includedir}/ico-state-machine/CicoBlockParser.h
-%{_includedir}/ico-state-machine/CicoEvent.h
-%{_includedir}/ico-state-machine/CicoEventInfo.h
-%{_includedir}/ico-state-machine/CicoFinalState.h
-%{_includedir}/ico-state-machine/CicoHistoryState.h
-%{_includedir}/ico-state-machine/CicoState.h
-%{_includedir}/ico-state-machine/CicoStateAction.h
-%{_includedir}/ico-state-machine/CicoStateCore.h
-%{_includedir}/ico-state-machine/CicoStateMachine.h
-%{_includedir}/ico-state-machine/CicoStateMachineCreator.h
+
index 74f6d32..e3b260b 100644 (file)
@@ -2,13 +2,13 @@
 
 Name:       ico-uxf-weston-plugin
 Summary:    Weston Plugins for IVI
-Version:    0.9.22
+Version:    0.9.23
 Release:    0
 Group:      Automotive/ICO Homescreen
 License:    MIT
 Source0:    %{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig(weston) >= 1.5.0
+BuildRequires: pkgconfig(weston) >= 1.6.0
 BuildRequires: pkgconfig(pixman-1)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(aul)
@@ -16,11 +16,11 @@ BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig
 BuildRequires: mesa-devel
-BuildRequires: genivi-shell-devel >= 0.2.3
-BuildRequires: weston-ivi-shell-devel >= 0.1.7
-Requires: weston >= 1.5.0
-Requires: genivi-shell >= 0.2.3
-Requires: weston-ivi-shell >= 0.1.7
+BuildRequires: genivi-shell-devel >= 0.2.4
+BuildRequires: weston-ivi-shell-devel >= 0.1.8
+Requires: weston >= 1.6.0
+Requires: genivi-shell >= 0.2.4
+Requires: weston-ivi-shell >= 0.1.8
 Requires: weekeyboard
 Conflicts: weston-ivi-config
 Conflicts: weston-ivi-shell-config
index 63dd06c..ca7a838 100644 (file)
@@ -1,50 +1,86 @@
 Name:       ico-vic-amb-plugin
-Summary:    Automotive Message Broker is a vehicle network abstraction system.
+Summary:    Automotive Message Broker is a vehicle network abstraction system
 Version:    0.9.5
-Release:    1.1
-Group:      System Environment/Daemons
-License:    LGPL v2.1
-URL:        ""
+Release:    0
+Group:      Automotive/ICO Homescreen
+License:    LGPL-2.1
 Source0:    %{name}-%{version}.tar.bz2
-Requires(post): /sbin/ldconfig
+Source1001: ico-vic-amb-plugin.manifest
+
+Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires:   libjson
-Requires:  ico-uxf-utilities
+Requires:       ico-uxf-utilities
 BuildRequires:  cmake
 BuildRequires:  boost-devel
-BuildRequires:  libjson-devel
+BuildRequires:  pkgconfig(json)
 BuildRequires:  automotive-message-broker-devel >= 0.10.0
 BuildRequires:  ico-uxf-utilities-devel >= 0.9.04
 BuildRequires:  ico-uxf-utilities >= 0.9.04
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(appcore-efl)
+BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(appcore-efl)
+BuildRequires:  sed
 
 %description 
+Automotive Message Broker is a vehicle network abstraction system
 Collection of plugins for automotive-message-broker
 
 %prep
 %setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
+sed -i 's#LIBDIR#%{_libdir}/#' packaging.in/config.tizen-ico
 
 %build
 %cmake
-
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/%{_sysconfdir}/ambd
-mkdir -p %{buildroot}/usr/bin
+mkdir -p %{buildroot}%{_sysconfdir}/ambd/examples/
 cp src/AMBformat.conf %{buildroot}/%{_sysconfdir}/ambd/
-cp tool/ico_set_vehicleinfo %{buildroot}/usr/bin/ico_set_vehicleinfo
+cp packaging.in/config.tizen-ico %{buildroot}%{_sysconfdir}/ambd/examples/config.tizen-ico
+mkdir -p %{buildroot}%{_bindir}
+cp tool/ico_set_vehicleinfo %{buildroot}%{_bindir}/ico_set_vehicleinfo
+
+%post
+/sbin/ldconfig
+
+# When installing ($1 == 1)
+if [ $1 -eq 1 ] ; then
+  # Back up the original configuration and create a symlink
+  # to ours if the configuration file exists.
+  if [ -f "%{_sysconfdir}/ambd/config.tizen" ]; then
+    echo "moving original AMB config.tizen -> config.tizen.orig"
+    mv "%{_sysconfdir}/ambd/config.tizen" "%{_sysconfdir}/ambd/config.tizen.orig"
+    echo "creating symlink AMB config.tizen -> examples/config.tizen-ico"
+    ln -sf "%{_sysconfdir}/ambd/examples/config.tizen-ico" "%{_sysconfdir}/ambd/config.tizen"
+  fi
+fi
+
+/bin/systemctl restart ambd
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+
+# When uninstalling ($1 == 0)
+if [ $1 -eq 0 ] ; then
+  # Return the original file if a symlink exists and
+  # we have the backup around
+  if [ -L "%{_sysconfdir}/ambd/config.tizen" ]; then
+    if [ -f "%{_sysconfdir}/ambd/config.tizen.orig" ]; then
+      echo "restoring AMB config file config.tizen.orig as config.tizen"
+      mv "%{_sysconfdir}/ambd/config.tizen.orig" "%{_sysconfdir}/ambd/config.tizen"
+    fi
+  fi
+fi
+
+/bin/systemctl restart ambd
 
 %files
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
+%manifest %{name}.manifest
 %{_libdir}/automotive-message-broker/*.so
-%{_sysconfdir}/ambd/AMBformat.conf
-/usr/share/doc/automotive-message-broker/%{name}/README
-/usr/bin/ico_set_vehicleinfo
+%config %{_sysconfdir}/ambd/AMBformat.conf
+%config %{_sysconfdir}/ambd/examples/config.tizen-ico
+%{_datadir}/doc/automotive-message-broker/%{name}/README
+%{_bindir}/ico_set_vehicleinfo
index 7acb0bd..7fb7d29 100644 (file)
@@ -13,8 +13,6 @@ BuildRequires:  cmake
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(drm-client)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(heynoti)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libmedia-utils)
@@ -23,6 +21,7 @@ BuildRequires:  pkgconfig(mmutil-imgp)
 BuildRequires:  pkgconfig(mmutil-jpeg)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 Requires:       media-server
 
 %description
index 674f1c0..34e3d87 100644 (file)
@@ -1,51 +1,56 @@
 Name:       libmm-common
-Version:    0.2.55
-Release:    0
-Summary:    Multimedia Framework Common Library
+Summary:    Multimedia Framework Common Lib
+Version:    0.2.85
+Release:    1
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:     libmm-common.manifest
-BuildRequires:  pkgconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(mm-log)
 
+
 %description
-Multimedia Framework Common Library package.
+Multimedia Framework Common Library
 
 %package devel
 Summary:    Multimedia Framework Common Lib (devel)
 Group:      Development/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Multimedia Framework Common Library (devel) package.
+Multimedia Framework Common Library (devel)
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
 
-%build
 
+%build
 CFLAGS="%{optflags} -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
+export CFLAGS+=" -Wall -Wcast-align -Wcast-qual -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable"
 %reconfigure
-%__make %{?_smp_mflags}
+make %{?jobs:-j%jobs}
+
 
 %install
+rm -rf %{buildroot}
 %make_install
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
-%manifest %{name}.manifest
+%manifest libmm-common.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libmmfcommon.so.*
-%license LICENSE.APLv2
+
 
 %files devel
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/mmf/SLP_MultimediaFW_PG.h
 %{_includedir}/mmf/mm_types.h
index d6b559e..1eda867 100755 (executable)
@@ -1,6 +1,6 @@
 Name:      libmm-fileinfo
 Summary:    Media Fileinfo
-Version:    0.6.0
+Version:    0.6.1
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
index 99bf90d..6e33c18 100644 (file)
@@ -3,9 +3,9 @@
 
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.7.2f
+Version:    0.7.2h
 Release:    0
-Group:      System/Libraries
+Group:      Multimedia/Media Playback
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    sound-server.service
@@ -26,12 +26,11 @@ BuildRequires:      pkgconfig(heynoti)
 BuildRequires:      pkgconfig(security-server)
 
 %description
-MMSound Package contains client lib and sound_server binary for sound system
+MMSound Package contains client lib for sound system
 
 
 %package devel
 Summary: MMSound development package
-Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -39,7 +38,6 @@ MMSound development package for sound system
 
 %package sdk-devel
 Summary: MMSound development package
-Group:      System/Libraries
 Requires:   %{name}-devel = %{version}-%{release}
 
 %description sdk-devel
@@ -47,12 +45,17 @@ MMSound development package for sound system
 
 %package tool
 Summary: MMSound utility package - contians mm_sound_testsuite, sound_check
-Group:      System/Utilities
 Requires:   %{name} = %{version}-%{release}
 
 %description tool
 MMSound utility package - contians mm_sound_testsuite, sound_check for sound system
 
+%package -n sound-server
+Summary: Sound server package
+Requires: %{name} = %{version}-%{release}
+
+%description -n sound-server
+Sound server package
 
 %prep
 %setup -q
@@ -83,18 +86,11 @@ CFLAGS="$CFLAGS -DMURPHY"; export CFLAGS
 
 %install
 %make_install
-install -d %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants
-install -m0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system/
-install -m0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system/
-ln -sf ../sound-server.path %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/sound-server.path
-
-# FIXME: remove after systemd is in
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d
-ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S23soundserver
-ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S23soundserver
+install -d %{buildroot}%{_unitdir}/multi-user.target.wants
+install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/
+install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/
 
+%install_service multi-user.target.wants sound-server.path
 
 %post
 /sbin/ldconfig
@@ -113,27 +109,16 @@ ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc
 
 %postun -p /sbin/ldconfig
 
+%post -n sound-server -p /sbin/ldconfig
+
+%postun -n sound-server -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_bindir}/sound_server
 %{_libdir}/libmmfsound.so.*
 %{_libdir}/libmmfsoundcommon.so.*
 %{_libdir}/libmmfkeysound.so.*
-%{_libdir}/libsoundplugintone.so*
-%{_libdir}/libsoundpluginwave.so*
-%{_libdir}/libsoundpluginkeytone.so*
-%{_libdir}/soundplugins/libsoundplugintone.so
-%{_libdir}/soundplugins/libsoundpluginwave.so
-%{_libdir}/soundplugins/libsoundpluginkeytone.so
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/soundserver
-%{_sysconfdir}/rc.d/rc3.d/S23soundserver
-%{_sysconfdir}/rc.d/rc4.d/S23soundserver
-%{_prefix}/share/sounds/sound-server/*
-%{_prefix}/lib/systemd/system/multi-user.target.wants/sound-server.path
-%{_prefix}/lib/systemd/system/sound-server.service
-%{_prefix}/lib/systemd/system/sound-server.path
 
 %files devel
 %manifest %{name}.manifest
@@ -156,3 +141,18 @@ ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/mm_sound_testsuite
+
+%files -n sound-server
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_bindir}/sound_server
+%{_libdir}/libsoundplugintone.so*
+%{_libdir}/libsoundpluginwave.so*
+%{_libdir}/libsoundpluginkeytone.so*
+%{_libdir}/soundplugins/libsoundplugintone.so
+%{_libdir}/soundplugins/libsoundpluginwave.so
+%{_libdir}/soundplugins/libsoundpluginkeytone.so
+%{_prefix}/share/sounds/sound-server/*
+%{_unitdir}/multi-user.target.wants/sound-server.path
+%{_unitdir}/sound-server.service
+%{_unitdir}/sound-server.path
index 2efd0ff..44fd2eb 100644 (file)
@@ -1,13 +1,15 @@
 %define have_lang 1
+%define baseline 0.18
 
 Name:           libsecret
-Version:        0.15
+Version:        0.18
 Release:        0
 Summary:        Library for accessing the Secret Service API
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://www.gnome.org/
-Source0:        http://download.gnome.org/sources/libsecret/0.13/%{name}-%{version}.tar.xz
+#X-Vc-Url:      git://git.gnome.org/libsecret
+Source0:        http://download.gnome.org/sources/libsecret/%{baseline}/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -21,7 +23,7 @@ BuildRequires:  pkgconfig(gio-2.0) >= 2.31.0
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.31.0
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.29
-Recommends:     %{name}-lang
+Recommends:     %{name}-lang = %{version}-%{release}
 
 %description
 libsecret is a library for storing and retrieving passwords and other
@@ -37,16 +39,6 @@ secrets. It communicates with the "Secret Service" using DBus.
 
 This package provides the GObject Introspection bindings for libsecret.
 
-%package -n typelib-SecretUnstable
-Summary:        Library for accessing the Secret Service API -- Introspection bindings
-Group:          System/Libraries
-
-%description -n typelib-SecretUnstable
-libsecret is a library for storing and retrieving passwords and other
-secrets. It communicates with the "Secret Service" using DBus.
-
-This package provides the GObject Introspection bindings for libsecret.
-
 %package tools
 Summary:        Library for accessing the Secret Service API -- Tools
 Group:          System/Libraries
@@ -58,9 +50,8 @@ secrets. It communicates with the "Secret Service" using DBus.
 %package devel
 Summary:        Library for accessing the Secret Service API -- Development Files
 Group:          Development/Libraries
-Requires:       libsecret = %{version}
-Requires:       typelib-Secret = %{version}
-Requires:       typelib-SecretUnstable = %{version}
+Requires:       libsecret = %{version}-%{release}
+Requires:       typelib-Secret = %{version}-%{release}
 
 %description devel
 libsecret is a library for storing and retrieving passwords and other
@@ -72,8 +63,9 @@ secrets. It communicates with the "Secret Service" using DBus.
 
 %build
 %autogen \
-        --disable-static
-make V=1
+       --disable-static
+
+%__make  %{?_smp_mflags}
 
 %install
 %make_install
@@ -85,6 +77,8 @@ rm -rf %{buildroot}%{_datadir}/locales/*
 
 %postun -p /sbin/ldconfig
 
+%docs_package
+
 %files 
 %defattr (-, root, root)
 %license COPYING
@@ -94,10 +88,6 @@ rm -rf %{buildroot}%{_datadir}/locales/*
 %defattr(-,root,root)
 %{_libdir}/girepository-1.0/Secret-1.typelib
 
-%files -n typelib-SecretUnstable
-%defattr(-,root,root)
-%{_libdir}/girepository-1.0/SecretUnstable-0.typelib
-
 %files tools
 %defattr(-,root,root)
 %{_bindir}/secret-tool
@@ -110,11 +100,5 @@ rm -rf %{buildroot}%{_datadir}/locales/*
 %{_libdir}/pkgconfig/libsecret-unstable.pc
 %{_includedir}/libsecret-1/
 %{_datadir}/gir-1.0/Secret-1.gir
-%{_datadir}/gir-1.0/SecretUnstable-0.gir
-%dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libsecret-1.deps
 %{_datadir}/vala/vapi/libsecret-1.vapi
-%{_datadir}/vala/vapi/libsecret-unstable.deps
-%{_datadir}/vala/vapi/libsecret-unstable.vapi
-%{_datadir}/vala/vapi/mock-service-0.vapi
-
index 2b63d10..70ee932 100755 (executable)
@@ -6,29 +6,27 @@ Group:      Location/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001: libslp-location.manifest
-Requires(post):    /sbin/ldconfig
-Requires(post):    /usr/bin/vconftool
+Requires(post):  /sbin/ldconfig
+Requires(post):  /usr/bin/vconftool
 Requires(postun):  /sbin/ldconfig
-BuildRequires:     pkgconfig
-BuildRequires:     pkgconfig(glib-2.0)
-BuildRequires:     pkgconfig(dbus-glib-1)
-BuildRequires:     pkgconfig(gmodule-2.0)
-BuildRequires:     pkgconfig(dlog)
-BuildRequires:     pkgconfig(vconf)
-BuildRequires:     pkgconfig(json-glib-1.0)
-
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gmodule-2.0)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(json-glib-1.0)
 
 %description
 Location Based Service Libraries
 
 
 %package devel
-Summary:    Location Based Service (dev)
+Summary:    Location Based Service (Development files)
 Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Location Based Service (Development Package).
+Location Based Service Development Package
 
 
 %prep
@@ -37,9 +35,11 @@ cp %{SOURCE1001} .
 
 
 %build
-./autogen.sh
-%configure  --enable-dlog --enable-debug
-%__make %{?jobs:-j%jobs}
+
+%autogen
+%reconfigure  --enable-dlog --enable-debug
+
+%__make %{?_smp_mflags}
 
 
 %install
index e929637..4b24e36 100644 (file)
@@ -2,8 +2,8 @@
 %bcond_with wayland
 
 Name:           libtbm
-Version:        1.1.0
-Release:        3
+Version:        1.1.1
+Release:        1
 License:        MIT
 Summary:        The library for Tizen Buffer Manager
 Group:          System/Libraries
index 08389f3..a18d879 100755 (executable)
@@ -91,7 +91,7 @@ chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/data-media
 chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/file-manager-service
 
 # setup dbupdate in user session
-mkdir -p %{_unitdir_user}/default.target.requires/
+mkdir -p %{_unitdir_user}/default.target.wants/
 ln -sf ../media-server-user.service  %{_unitdir_user}/default.target.wants/
 
 %post -n libmedia-utils -p /sbin/ldconfig
index 8baa793..ed98635 100644 (file)
@@ -1,6 +1,6 @@
 Name:    neardal
 Summary: Neard Abstraction Library (for Neard v0.7)
-Version: 0.7.0
+Version: 0.14
 Release: 0
 Group:   Network & Connectivity/NFC
 License: LGPL-2.0
@@ -15,6 +15,7 @@ BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: automake
 BuildRequires: autoconf
+BuildRequires: readline-devel
 BuildRequires: gettext-tools
 BuildRequires: python-xml
 BuildRequires: pkgconfig(glib-2.0) >= 2.30.0
@@ -53,7 +54,8 @@ rm -rf %{buildroot}
 %license COPYING
 %doc README AUTHORS
 %{_libdir}/libneardal.so.0
-%{_libdir}/libneardal.so.0.0.1
+%{_libdir}/libneardal.so.0.0.*
+%{_sysconfdir}/dbus-1/system.d/org.neardal.conf
 
 %files devel
 %manifest %{name}.manifest
index cc353ab..9dd4719 100644 (file)
@@ -1,5 +1,5 @@
 Name:           ofono
-Version:        1.14
+Version:        1.15
 Release:        0
 License:        GPL-2.0
 Summary:        Open Source Telephony
diff --git a/proto-meta-Tizen_generic/specfile-initial/opencore-amr/packaging/opencore-amr.spec b/proto-meta-Tizen_generic/specfile-initial/opencore-amr/packaging/opencore-amr.spec
new file mode 100644 (file)
index 0000000..0dececa
--- /dev/null
@@ -0,0 +1,60 @@
+Name:       opencore-amr
+Summary:    opencore AMRNB dev package
+Version:    0.1.2
+Release:    4
+Group:      libdevel
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1001:    opencore-amr.manifest
+
+
+%description
+opencore AMRNB dev package
+
+
+%package devel 
+Summary:    opencore AMRNB dev package (Developement)
+Group:      TO_BE_FILLED 
+Requires:   %{name} = %{version}-%{release}
+
+%description devel
+opencore AMRNB dev package (Developement)
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+./autogen.sh
+%configure
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp LICENSE %{buildroot}/usr/share/license/%{name}
+%make_install
+
+%post
+
+%postun
+
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libopencore-amrnb.so.0
+%{_libdir}/libopencore-amrnb.so.0.0.2
+%{_libdir}/libopencore-amrwb.so.0
+%{_libdir}/libopencore-amrwb.so.0.0.2
+%{_datadir}/license/%{name}
+
+%files devel 
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_includedir}/opencore-amrnb/*.h
+%{_includedir}/opencore-amrwb/*.h
+%{_libdir}/libopencore-amrnb.so
+%{_libdir}/libopencore-amrwb.so
+%{_libdir}/pkgconfig/opencore-amrnb.pc
+%{_libdir}/pkgconfig/opencore-amrwb.pc
index 74241c6..9555fca 100644 (file)
@@ -193,21 +193,18 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm
 chmod 755 %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{rpmhome}/macros.d
 # remove some nonsense or non-working scripts
-CURDIR=$(pwd)
-cd %{buildroot}%{rpmhome}/
 for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
          magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
          brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
          rpmdb_* brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile
 do
-    rm -f $f
+    rm -f %{buildroot}%{rpmhome}/$f
 done
 for i in %{_datadir}/automake-*/*; do
-  if test -f "$i" && test -f "${i##*/}"; then
-    rm -f "${i##*/}"
+  if test -f "$i" && test -f %{buildroot}%{rpmhome}/"${i##*/}"; then
+    rm -f %{buildroot}%{rpmhome}/"${i##*/}"
   fi
 done
-cd ${CURDIR}
 %ifarch aarch64 ppc64le
 install -m 755 config.guess %{buildroot}/usr/lib/rpm
 install -m 755 config.sub %{buildroot}/usr/lib/rpm
diff --git a/proto-meta-Tizen_generic/specfile-initial/security-manager/packaging/security-manager.spec b/proto-meta-Tizen_generic/specfile-initial/security-manager/packaging/security-manager.spec
new file mode 100644 (file)
index 0000000..2a3c653
--- /dev/null
@@ -0,0 +1,145 @@
+Name:       security-manager
+Summary:    Security manager and utilities
+Version:    0.2.0
+Release:    1
+Group:      Security/Service
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1:    security-manager.manifest
+Source3:    libsecurity-manager-client.manifest
+Requires(post): smack
+BuildRequires: cmake
+BuildRequires: zip
+BuildRequires: libattr-devel
+BuildRequires: pkgconfig(libsmack)
+BuildRequires: pkgconfig(libcap)
+BuildRequires: pkgconfig(libsystemd-daemon)
+BuildRequires: pkgconfig(libsystemd-journal)
+BuildRequires: pkgconfig(libtzplatform-config)
+BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(db-util)
+BuildRequires: pkgconfig(cynara-admin)
+BuildRequires: pkgconfig(cynara-client)
+BuildRequires: boost-devel
+%{?systemd_requires}
+
+%description
+Tizen security manager and utilities
+
+%package -n libsecurity-manager-client
+Summary:    Security manager (client)
+Group:      Security/Libraries
+Requires:   security-manager = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libsecurity-manager-client
+Tizen Security manager client library
+
+%package -n libsecurity-manager-client-devel
+Summary:    Security manager (client-devel)
+Group:      Security/Development
+Requires:   libsecurity-manager-client = %{version}-%{release}
+
+%description -n libsecurity-manager-client-devel
+Development files needed for using the security manager client
+
+%prep
+%setup -q
+cp %{SOURCE1} .
+cp %{SOURCE3} .
+
+%build
+%if 0%{?sec_build_binary_debug_enable}
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+%endif
+
+export LDFLAGS+="-Wl,--rpath=%{_libdir}"
+
+%cmake . -DVERSION=%{version} \
+        -DBIN_INSTALL_DIR=%{_bindir} \
+        -DDB_INSTALL_DIR=%{TZ_SYS_DB} \
+        -DSYSTEMD_INSTALL_DIR=%{_unitdir} \
+        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
+        -DCMAKE_VERBOSE_MAKEFILE=ON
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp LICENSE %{buildroot}/usr/share/license/%{name}
+cp LICENSE %{buildroot}/usr/share/license/libsecurity-manager-client
+mkdir -p %{buildroot}/%{TZ_SYS_SMACK}
+cp app-rules-template.smack %{buildroot}/%{TZ_SYS_SMACK}
+%make_install
+
+mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants
+mkdir -p %{buildroot}/%{_unitdir}/sockets.target.wants
+ln -s ../security-manager.service %{buildroot}/%{_unitdir}/multi-user.target.wants/security-manager.service
+ln -s ../security-manager.socket %{buildroot}/%{_unitdir}/sockets.target.wants/security-manager.socket
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+systemctl daemon-reload
+if [ $1 = 1 ]; then
+    # installation
+    systemctl start security-manager.service
+fi
+
+if [ $1 = 2 ]; then
+    # update
+    systemctl restart security-manager.service
+fi
+chsmack -a System %{TZ_SYS_DB}/.security-manager.db
+chsmack -a System %{TZ_SYS_DB}/.security-manager.db-journal
+
+%preun
+if [ $1 = 0 ]; then
+    # unistall
+    systemctl stop security-manager.service
+fi
+
+%postun
+/sbin/ldconfig
+if [ $1 = 0 ]; then
+    # unistall
+    systemctl daemon-reload
+fi
+
+%post -n libsecurity-manager-client -p /sbin/ldconfig
+
+%postun -n libsecurity-manager-client -p /sbin/ldconfig
+
+%files -n security-manager
+%manifest security-manager.manifest
+%defattr(-,root,root,-)
+%attr(755,root,root) %{_bindir}/security-manager
+%{_libdir}/libsecurity-manager-commons.so.*
+%attr(-,root,root) %{_unitdir}/multi-user.target.wants/security-manager.service
+%attr(-,root,root) %{_unitdir}/security-manager.service
+%attr(-,root,root) %{_unitdir}/security-manager.target
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-manager.socket
+%attr(-,root,root) %{_unitdir}/security-manager.socket
+%attr(-,root,root) %{TZ_SYS_SMACK}/app-rules-template.smack
+%config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db
+%config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db-journal
+%{_datadir}/license/%{name}
+
+%files -n libsecurity-manager-client
+%manifest libsecurity-manager-client.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libsecurity-manager-client.so.*
+%{_datadir}/license/libsecurity-manager-client
+
+%files -n libsecurity-manager-client-devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libsecurity-manager-client.so
+%{_libdir}/libsecurity-manager-commons.so
+%{_includedir}/security-manager/security-manager.h
+%{_libdir}/pkgconfig/security-manager.pc
index 284d22f..61e4711 100644 (file)
@@ -28,6 +28,7 @@ BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(iniparser)
+BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgmgr-info-parser-devel
 BuildRequires:  pkgmgr-info-parser
@@ -93,12 +94,7 @@ Package Manager client types develpoment package for packaging
 cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{SOURCE1005} %{SOURCE1006} %{SOURCE1007} .
 
 %build
-%cmake . \
-%if %{with wayland}
-    -DX11_SUPPORT=Off
-%else
-    -DX11_SUPPORT=On
-%endif
+%cmake .
 
 %__make %{?_smp_mflags}
 
@@ -124,6 +120,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/package-manager/server
 # For pkgmgr-install:
 # Update mime database to support package mime types
 update-mime-database %{_datadir}/mime
+chsmack -a '*' %{TZ_SYS_RW_PACKAGES}
 
 %post -n pkgmgr-server -p /sbin/ldconfig
 
@@ -144,12 +141,18 @@ update-mime-database %{_datadir}/mime
 %dir %{_sysconfdir}/opt/upgrade
 %{_sysconfdir}/opt/upgrade/pkgmgr.patch.sh
 %{_bindir}/pkgcmd
+%attr(06755,root,root) %{_bindir}/pkg_createdb
+%attr(755,root,root) %{_bindir}/pkg_createdb_user
+%attr(06755,root,root) %{_bindir}/pkg_syncdb
+%attr(755,root,root) %{_bindir}/pkg_syncdb_user
+#obsolete tools
 %attr(06755,root,root) %{_bindir}/pkg_initdb
+%attr(755,root,root) %{_bindir}/pkg_initdb_user
 %{_bindir}/pkg_getsize
 %{_bindir}/pkginfo
 %{_bindir}/pkgmgr-install
-%dir %{_datadir}/packages
-%{_datadir}/packages/org.tizen.pkgmgr-install.xml
+%attr(-,tizenglobalapp,root) %dir %{TZ_SYS_RW_PACKAGES}
+%attr(-,tizenglobalapp,root) %{TZ_SYS_RW_PACKAGES}/org.tizen.pkgmgr-install.xml
 %{_datadir}/mime/packages/mime.wac.xml
 %{_datadir}/mime/packages/mime.tpk.xml
 %exclude %{_includedir}/pkgmgr/comm_client.h
index 0ba1b20..b9dc425 100644 (file)
@@ -1,5 +1,5 @@
 Name:       smack
-Version:    1.0.4
+Version:    1.0.5
 Release:    1
 Summary:    Selection of tools for developers working with Smack
 Group:      Security/Access Control
index a785fa2..b524dcc 100644 (file)
@@ -47,7 +47,7 @@ Python interface to sphinxbase package
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{python_sitearch}
-%make_install DESTDIR=%{buildroot}
+%make_install
 rm -f %{buildroot}%{_libdir}/*.la
 
 # Install the man pages
index fa0d404..bf3e0c7 100644 (file)
@@ -10,7 +10,7 @@
 %if ! 0%{?_rootprefix:1}
 %define _rootprefix %{_prefix}
 %endif
-%define _rootlibdir %{_rootprefix}/lib
+%define _rootlibdir %{_rootprefix}/%{_lib}
 
 Name:           systemd
 Version:        216
@@ -23,6 +23,8 @@ Group:          Base/Startup
 Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
 Source1:        pamconsole-tmp.conf
 Source2:        %{name}-rpmlintrc
+Source3:        default.target
+Source4:        default.target.ivi
 Source1001:     systemd.manifest
 BuildRequires:  gperf
 BuildRequires:  hwdata
@@ -42,8 +44,11 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libkmod)
-
+%if %{with kdbus}
+Requires:       kdbus-kmod
+%else
 Requires:       dbus
+%endif
 Requires:       filesystem
 Requires:       hwdata
 Requires(post): coreutils
@@ -150,6 +155,7 @@ intltoolize --force --automake
         --libexecdir=%{_prefix}/lib \
         --docdir=%{_docdir}/systemd \
         --disable-static \
+        --disable-libcurl \
         --with-sysvinit-path= \
         --with-sysvrcnd-path= \
         --with-smack-run-label=System \
@@ -230,19 +236,29 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/
 # Install modprobe fragment
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
 
-# Enable readahead services
-ln -sf ../systemd-readahead-collect.service %{buildroot}%{_unitdir}/default.target.wants/
-ln -sf ../systemd-readahead-replay.service %{buildroot}%{_unitdir}/default.target.wants/
-
 # Fix the dangling /var/lock -> /run/lock symlink
 install -Dm644 tmpfiles.d/legacy.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/legacy.conf
 
 install -m644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/
 
-rm -rf %{buildroot}/%{_unitdir_user}/default.target
+rm -rf %{buildroot}%{_unitdir}/default.target
+install -m 755 -d %{buildroot}%{_unitdir}
+%if "%{profile}" != "ivi"
+install -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/
+%else
+install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/default.target
+%endif
 
 rm -rf %{buildroot}/%{_docdir}/%{name}
 
+# Disable some useless services in Tizen
+rm -rf %{buildroot}%{_unitdir_user}/sysinit.target.wants/dev-hugepages.mount
+rm -rf %{buildroot}%{_unitdir_user}/sysinit.target.wants/sys-fs-fuse-connections.mount
+rm -rf %{buildroot}%{_unitdir_user}/sysinit.target.wants/systemd-binfmt.service
+rm -rf %{buildroot}%{_unitdir_user}/sysinit.target.wants/systemd-modules-load.service
+rm -rf %{buildroot}%{_unitdir_user}/sysinit.target.wants/systemd-ask-password-console.path
+rm -rf %{buildroot}%{_unitdir_user}/multi-user.target.wants/systemd-ask-password-wall.path
+
 # Move macros to the proper location for Tizen
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 install -m644 src/core/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd
@@ -257,17 +273,20 @@ rm -f %{buildroot}/%{_rootprefix}/lib/systemd/system-generators/systemd-debug-ge
 rm -f %{buildroot}/%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator
 
 # end of install
+
 %pre
-getent group cdrom >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
-getent group tape >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 33 tape >/dev/null 2>&1 || :
-getent group dialout >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 18 dialout >/dev/null 2>&1 || :
-getent group floppy >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 19 floppy >/dev/null 2>&1 || :
+getent group cdrom >/dev/null   2>&1 || groupadd -r -g 11 cdrom   >/dev/null 2>&1 || :
+getent group tape >/dev/null    2>&1 || groupadd -r -g 33 tape    >/dev/null 2>&1 || :
+getent group dialout >/dev/null 2>&1 || groupadd -r -g 18 dialout >/dev/null 2>&1 || :
+getent group floppy >/dev/null  2>&1 || groupadd -r -g 19 floppy  >/dev/null 2>&1 || :
 systemctl stop systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udevd.service >/dev/null 2>&1 || :
 
 # Rename configuration files that changed their names
 mv -n %{_sysconfdir}/systemd/systemd-logind.conf %{_sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
 mv -n %{_sysconfdir}/systemd/systemd-journald.conf %{_sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
 
+
+
 %post
 systemd-machine-id-setup > /dev/null 2>&1 || :
 systemd-random-seed save > /dev/null 2>&1 || :
@@ -287,8 +306,6 @@ if [ $1 -eq 0 ] ; then
                 remote-fs.target \
                 systemd-readahead-replay.service \
                 systemd-readahead-collect.service >/dev/null 2>&1 || :
-
-        rm -f %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
 fi
 
 %post -n libsystemd -p /sbin/ldconfig
@@ -404,12 +421,12 @@ fi
 %{_unitdir_user}/timers.target
 %{_unitdir_user}/busnames.target
 %if %{with kdbus}
-%{_rootprefix}/lib/systemd/user/systemd-bus-proxyd.socket
-%{_rootprefix}/lib/systemd/user/systemd-bus-proxyd@.service
+%{_unitdir_user}/systemd-bus-proxyd.socket
+%{_unitdir_user}/systemd-bus-proxyd@.service
 %endif
 %exclude %{_rootprefix}/lib/systemd/network/80-container-ve.network
 %exclude %{_rootprefix}/lib/systemd/network/80-container-host0.network
-%{_rootprefix}/lib/systemd/network/80-container-host0.network
+%{_unitdir_user}/default.target
 %{_rootprefix}/lib/systemd/network/99-default.link
 %exclude %{_rootprefix}/lib/systemd/system-preset/90-systemd.preset
 
index baa590a..1c07757 100644 (file)
@@ -1,14 +1,12 @@
 Name:           tdb
-Version:        1.2.10
+Version:        1.3.1
 Release:        0
 Summary:        Samba Trivial Database
-License:        GPLv3.0+
+License:        GPL-3.0+
 Group:          System/Libraries
 Url:            http://tdb.samba.org/
 Source:         http://www.samba.org/ftp/tdb/tdb-%{version}.tar.gz
-Source1001:    tdb.manifest
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source1001:     tdb.manifest
 BuildRequires:  autoconf
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(python)
@@ -77,10 +75,11 @@ This package contains python language support.
 cp %{SOURCE1001} .
 
 %build
-%configure 
+%configure
 #--disable-python
 
-%{__make} %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
+
 
 %install
 %make_install
index f43bc32..e8dd0c0 100644 (file)
@@ -1,5 +1,5 @@
 Name:           tiff
-Version:        4.0.2
+Version:        4.0.3
 Release:        0
 License:        HPND
 Summary:        Tools for Converting from and to the Tiff Format
@@ -77,7 +77,7 @@ find html -name "Makefile*" | xargs rm
 
 %files -n libtiff
 %manifest %{name}.manifest
-%doc COPYRIGHT
+%license COPYRIGHT
 %{_libdir}/*.so.*
 
 %files -n libtiff-devel
@@ -86,4 +86,3 @@ find html -name "Makefile*" | xargs rm
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
-%changelog
index 3adb836..5009fd6 100644 (file)
@@ -8,7 +8,7 @@
 %define _audiosystem_demo_package tizen-extensions-crosswalk-audiosystem-demo
 
 Name:       tizen-extensions-crosswalk
-Version:    0.120
+Version:    0.142
 Release:    0
 License:    BSD-3-Clause and Apache-2.0
 Group:      Development/Libraries
index 8b1c43f..5606952 100644 (file)
@@ -1,16 +1,14 @@
-%define         baseline 0.24
-%define         vala_version 0.24
-%define         vala_libversion 0_24
-%define         vala_priority 24
+%define         vala_version 0.26
+%define         vala_priority 26
 
 Name:           vala
-Version:        0.24.0
+Version:        0.26.1
 Release:        0
 Summary:        Programming language for GNOME
 License:        LGPL-2.0
 Group:          Platform Development/Utilities
 Url:            http://live.gnome.org/Vala
-Source0:        http://download.gnome.org/sources/vala/%{baseline}/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/vala/%{vala_version}/%{name}-%{version}.tar.xz
 Source1001:     %{name}.manifest
 
 BuildRequires:  bison
@@ -40,7 +38,7 @@ compared to applications and libraries written in C.
 %package -n libvala-devel
 Summary:        Programming language for GNOME
 Group:          Platform Development/Utilities
-Requires:       libvala = %{version}
+Requires:       libvala = %{version}-%{release}
 
 %description -n libvala-devel
 Vala is a new programming language that aims to bring modern
diff --git a/proto-meta-Tizen_generic/specfile-initial/vconf-buxton/packaging/vconf-buxton.spec b/proto-meta-Tizen_generic/specfile-initial/vconf-buxton/packaging/vconf-buxton.spec
new file mode 100644 (file)
index 0000000..30186c8
--- /dev/null
@@ -0,0 +1,98 @@
+# set overwrite_vconf by default
+%bcond_without overwrite_vconf
+
+%if %{with overwrite_vconf}
+%define libname vconf
+%define toolname vconftool
+%else
+%define libname vconf-buxton
+%define toolname vconf-buxton-tool
+%endif
+
+Name:       vconf-buxton
+Summary:    Configuration system library
+Version:    0.3
+Release:    1
+Group:      System/Libraries
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1001:    vconf-buxton.manifest
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(buxton)
+BuildRequires:  pkgconfig(vconf-internal-keys)
+Obsoletes: vconf
+Obsoletes:  vconf-devel
+Obsoletes:  vconf-keys-devel
+Provides: vconf
+
+%description 
+Configuration system library having vconf API and buxton backend
+
+%package devel
+Summary:    Vconf-buxton (devel)
+Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-keys-devel = %{version}-%{release}
+Obsoletes:  vconf-devel
+Provides:  vconf-devel
+
+%description devel
+Vconf library (devel)
+
+%package keys-devel
+Summary:    Vconf-buxton (devel)
+Requires:   %{name} = %{version}-%{release}
+Requires:   vconf-internal-keys-devel
+Obsoletes:  vconf-keys-devel
+Obsoletes:  vconf-devel
+Provides:  vconf-keys-devel
+
+%description keys-devel
+Vconf key management header files
+
+%prep
+%setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
+
+%build
+%cmake -DLIBNAME:STRING=%{libname} -DTOOLNAME:STRING=%{toolname} .
+make %{?jobs:-j%jobs}
+
+%install
+%make_install
+mv %{buildroot}%{_unitdir}/vconf-buxton-setup.service %{buildroot}%{_unitdir}/%{libname}-setup.service
+mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
+ln -sf ../%{libname}-setup.service %{buildroot}%{_unitdir}/basic.target.wants/
+
+%post
+/sbin/ldconfig
+vconf-buxton-init-from-vconf.sh
+
+%postun
+/sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%license LICENSE.APLv2
+%{_bindir}/%{toolname}
+%{_bindir}/vconf-buxton-init-from-vconf.sh
+%{_bindir}/vconf-buxton-restore-mem-layer.sh
+%{_bindir}/vconf-buxton-backup-mem-layer.sh
+%{_libdir}/lib%{libname}.so.*
+%{_unitdir}/basic.target.wants/%{libname}-setup.service
+%{_unitdir}/%{libname}-setup.service
+
+%files devel
+%manifest %{name}.manifest
+%{_includedir}/vconf/vconf.h
+%{_includedir}/vconf/vconf-buxton.h
+%{_libdir}/pkgconfig/%{libname}.pc
+%{_libdir}/lib%{libname}.so
+
+%files keys-devel
+%manifest %{name}.manifest
+%{_includedir}/vconf/vconf-keys.h
+%{_includedir}/vconf/vconf-buxton-keys.h
+
index 2e19184..cd4b35c 100644 (file)
@@ -1,5 +1,5 @@
 Name:           genivi-shell
-Version:        0.2.3
+Version:        0.2.5
 Release:        0
 Summary:        GENIVI Shell Plugin-in
 License:        Apache-2.0
@@ -8,8 +8,7 @@ Url:            http://git.projects.genivi.org/wayland-ivi-extension.git
 Source0:        %name-%version.tar.gz
 Source1001:     genivi-shell.manifest
 BuildRequires:  cmake
-BuildRequires:  weston-ivi-shell-devel >= 0.1.7
-BuildRequires:  pkgconfig
+BuildRequires:  weston-ivi-shell-devel >= 0.1.9
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-server)
@@ -38,8 +37,6 @@ cp %{SOURCE1001} .
 /usr/bin/wayland-scanner code < protocol/ivi-controller.xml \
     > protocol/ivi-controller-protocol.c
 
-%build
-
 cat ivi-extension-protocol.pc.in \
     | sed s\#@libdir@\#%{_libdir}\#g \
     | sed s\#@includedir@\#%{_includedir}/%{name}\#g \
@@ -49,7 +46,9 @@ cat ivi-extension-protocol.pc.in \
 
 %cmake .
 
-%__make %{?_smp_mflags} V=1
+%build
+
+make %{?_smp_mflags} V=1
 
 %install
 %make_install
@@ -99,6 +98,11 @@ install -m 644  ivi-extension-protocol.pc \
 %{_libdir}/libilmControl.so.*
 %{_libdir}/weston/ivi-controller.so
 
+%{_bindir}/EGLWLInputEventExample
+#%exclude %{_bindir}/EGLWLInputEventExample
+#%exclude /usr/lib/debug/usr/bin/EGLWLInputEventExample.debug
+
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/ilm/ilm_client.h
index a2efd25..8a4544a 100644 (file)
@@ -2,7 +2,7 @@
 
 Name:           weekeyboard
 Version:        0.0.3
-Release:        0
+Release:        1
 License:        Apache-2.0
 Summary:        Virtual Keyboard Application
 Url:            http://github.com/etrunko/weekeyboard
index 6faae7f..91bf9cc 100644 (file)
@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(pixman-1)
@@ -45,6 +46,12 @@ Summary: A small launcher for Wayland compositors
 
 %description tz-launcher
 A small launcher for Wayland compositors, which reads .desktop files from paths given on the command line or in a config file, and then displays them graphically.
+############ qa-plugin
+%package qa-plugin
+Summary: A Q&A plugin for Weston
+
+%description qa-plugin
+A small Weston plugin, disabled by default, which enables features such as listing surfaces along with positions and coordinates.
 ############
 
 %description
@@ -140,13 +147,8 @@ groupmod -A %{daemon_user} video
 mkdir -p %{_unitdir}/graphical.target.wants/
 ln -sf ../display-manager.path  %{_unitdir}/graphical.target.wants/
 
-# setup display manager access (inside user session)
-mkdir -p %{_unitdir_user}/default.target.requires/
-ln -sf ../weston-user.service  %{_unitdir_user}/default.target.requires/
-
 %postun
 rm -f %{_unitdir}/graphical.target.wants/display-manager.path
-rm -f %{_unitdir_user}/default.target.requires/weston-user.service
 
 %files
 %manifest %{name}.manifest
@@ -172,3 +174,10 @@ rm -f %{_unitdir_user}/default.target.requires/weston-user.service
 %license src/COPYING
 %{_bindir}/tz-launcher
 %{_bindir}/wl-pre
+
+%files qa-plugin
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%license src/COPYING
+%{_bindir}/weston-qa-client
+%{_libdir}/weston/qa-plugin.so
index 4e9bf9b..60dfa0d 100644 (file)
@@ -1,5 +1,5 @@
 Name:           weston-ivi-shell
-Version:        0.1.7
+Version:        0.1.9
 Release:        0
 Summary:        Weston IVI Shell
 License:        MIT
@@ -12,17 +12,17 @@ BuildRequires:  autoconf >= 2.64, automake >= 1.11
 BuildRequires:  libtool >= 2.2
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(weston) >= 1.5
+BuildRequires:  pkgconfig(weston) >= 1.6
 BuildRequires:  pkgconfig(cairo-egl) >= 1.11.3
 BuildRequires:  pkgconfig(egl) >= 7.10
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
 BuildRequires:  pkgconfig(pixman-1)
-BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-client) >= 1.6
 BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-server) >= 1.6
 BuildRequires:  pkgconfig(xkbcommon) >= 0.3.0
 BuildRequires:  pkgconfig(pangocairo) >= 1.34.0
-Requires:       weston >= 1.5
+Requires:       weston >= 1.6
 
 %description
 A reference Weston shell designed for use in IVI systems.
@@ -125,7 +125,6 @@ install -m 644 protocol/*.c \
 mkdir -p %{buildroot}%{weston_config_dir}
 install -m 0644 %{SOURCE1} %{buildroot}%{weston_config_dir}
 install -d %{buildroot}/%{_datadir}/weston/
-cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 
 %define _unpackaged_files_terminate_build 0
 
@@ -142,14 +141,23 @@ cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 
 %exclude %_bindir/weston
 %exclude %_libdir/weston/desktop-shell.so
+# exclude png files installed by the weston package
+%exclude %_datadir/weston/wayland.svg
+%exclude %_datadir/weston/wayland.png
+%exclude %_datadir/weston/pattern.png
+%exclude %_datadir/weston/terminal.png
+%exclude %_datadir/weston/border.png
+%exclude %_datadir/weston/icon_window.png
+%exclude %_datadir/weston/sign_close.png
+%exclude %_datadir/weston/sign_maximize.png
+%exclude %_datadir/weston/sign_minimize.png
 
 %files devel
 %manifest %{name}.manifest
 %_includedir/weston/ivi-layout-export.h
-%_includedir/weston/ivi-layout.h
+%_includedir/weston/ivi-layout-private.h
 %_includedir/weston/ivi-shell.h
 %_includedir/weston/ivi-shell-ext.h
-%_includedir/weston/ivi-layout-transition.h
 %{_datadir}/%{name}/protocol/*
 
 %files clients
index 0b2165b..69b5162 100644 (file)
@@ -26,6 +26,7 @@ compositor.
 Summary:    Tizen IVI Modello Weston configuration
 Group:      Automotive/Configuration
 Requires:   weekeyboard
+Requires:   tlm-config-ivi-singleseat
 Requires(post):   sed
 Requires(postun):   sed
 Conflicts:  ico-uxf-weston-plugin, weston-ivi-config
@@ -51,16 +52,12 @@ install -m 0644 weston.sh %{buildroot}%{_sysconfdir}/profile.d/
 %define weston_config_dir %{_sysconfdir}/xdg/weston
 mkdir -p %{buildroot}%{weston_config_dir}
 install -m 0644 weston.ini %{buildroot}%{weston_config_dir}
-install -m 0644 weston-modello.ini %{buildroot}%{weston_config_dir}/weston-modello.ini
 
 %post config-modello
-ln -s %{weston_config_dir}/weston-modello.ini %{weston_config_dir}/weston.ini
-sed -i 's/ --current-mode//' %{_unitdir_user}/weston.service
-
+sed -i 's/^\(SESSION_CMD\=.*user-session\)/\1-modello/' /etc/tlm-singleseat.conf
 
 %postun config-modello
-rm %{weston_config_dir}/weston.ini
-sed -i 's/\(^ExecStart.*\)/\1 --current-mode/' %{_unitdir_user}/weston.service
+sed -i 's/-modello//' /etc/tlm-singleseat.conf
 
 %files
 %manifest %{name}.manifest
@@ -76,4 +73,3 @@ sed -i 's/\(^ExecStart.*\)/\1 --current-mode/' %{_unitdir_user}/weston.service
 
 %files config-modello
 %manifest %{name}.manifest
-%config %{weston_config_dir}/weston-modello.ini
index 428b37b..9f15d7e 100644 (file)
@@ -1,4 +1,5 @@
 %bcond_with wayland
+%bcond_with libva
 %bcond_with mobile
 %bcond_with rdp
 
 %define extra_config_options3 --enable-sys-uid
 %endif
 
+%if "%{profile}" == "ivi"
+%define extra_config_options4 --disable-default-vkb --enable-transform
+%endif
+
 Name:           weston
 Version:        1.6.0
 Release:        0
@@ -25,8 +30,7 @@ Url:            http://weston.freedesktop.org/
 #Git-Clone:    git://anongit.freedesktop.org/wayland/weston
 #Git-Web:      http://cgit.freedesktop.org/wayland/weston/
 Source0:        %name-%version.tar.xz
-Source1:        %name.target
-Source1001:    %name.manifest
+Source1001:     %name.manifest
 BuildRequires: autoconf >= 2.64, automake >= 1.11
 BuildRequires:  expat-devel
 BuildRequires:  libjpeg-devel
@@ -53,6 +57,9 @@ BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libinput) >= 0.6.0
 BuildRequires:  pkgconfig(libsystemd-login)
 BuildRequires:  pkgconfig(libudev) >= 136
+%if %{with libva}
+BuildRequires:  pkgconfig(libva)
+%endif
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
 BuildRequires:  pkgconfig(pangocairo)
 BuildRequires:  pkgconfig(pixman-1)
@@ -61,7 +68,7 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.3.0
-Requires:       weston-startup
+Requires:       tlm
 Requires(pre):  /usr/sbin/groupadd
 
 %if !%{with wayland}
@@ -121,7 +128,8 @@ cp %{SOURCE1001} .
          --with-cairo=glesv2 \
          %{?extra_config_options1:%extra_config_options1} \
          %{?extra_config_options2:%extra_config_options2} \
-         %{?extra_config_options3:%extra_config_options3}
+         %{?extra_config_options3:%extra_config_options3} \
+         %{?extra_config_options4:%extra_config_options4}
 
 make %{?_smp_mflags}
 
@@ -151,18 +159,6 @@ install -m 755 weston-subsurfaces %{buildroot}%{_bindir}
 install -m 755 weston-transformed %{buildroot}%{_bindir}
 install -m 755 weston-fullscreen %{buildroot}%{_bindir}
 
-
-install -d %{buildroot}%{_unitdir_user}
-install -m 644 %{SOURCE1} %{buildroot}%{_unitdir_user}/weston.target
-# The weston.service unit file must be provided by the weston-startup
-# virtual package, i.e. "Provide: weston-startup".  The weston-startup
-# virtual package requirement is intended to force Tizen profile
-# maintainers to add the necessary start-up script or systemd unit
-# file to start weston. Otherwise it becomes possible to install
-# weston without an automated means to start weston at boot, which may
-# lead to confusion.  This approach allows startup related files to be
-# maintained outside of this weston package.
-
 %pre
 getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launch
 
@@ -188,7 +184,6 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launc
 %{_libdir}/weston/wayland-backend.so
 %{_libdir}/weston/gl-renderer.so
 %{_datadir}/weston
-%{_unitdir_user}/weston.target
 
 %files devel
 %manifest %{name}.manifest