update initial spec file

Change-Id: Ie8d5d5474ff5f8b74f10c4ed7058f05cbf85f6be

diff --git a/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec b/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
index 597246a..7835ebd 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
@@ -5,7 +5,7 @@
 Name:       bluetooth-frwk
 Summary:    Bluetooth framework for BlueZ and Obexd
 Version:    0.2.55
-Release:    2
+Release:    0
 Group:      Network & Connectivity/Bluetooth
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -84,11 +84,11 @@ cp %{SOURCE1001} .
 %build
 
 %ifarch x86_64
-export CFLAGS+="   -Wall -g -fvisibility=hidden -fPIC"
-export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs"
+export CFLAGS="${CFLAGS}   -Wall -g -fvisibility=hidden -fPIC"
+export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs"
 %else
-export CFLAGS+=" -fpie"
-export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
+export CFLAGS="${CFLAGS} -fpie"
+export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 %endif
 
 %cmake . \
@@ -105,7 +105,7 @@ export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbol
  -DLIBNOTIFICATION_SUPPORT=Off
 %endif
 
-make
+%__make
 
 %install
 rm -rf %{buildroot}
@@ -133,6 +133,12 @@ vconftool set -tf int file/private/bt-service/flight_mode_deactivated "0" -g 652
 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
+# 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
+chsmack -a 'User' %TZ_SYS_CONFIG/memory_init/memory/bluetooth/sco_headset_name
+chsmack -a 'User' %TZ_SYS_CONFIG/memory_init/memory/bluetooth/device
+chsmack -a 'User' %TZ_SYS_CONFIG/memory_init/memory/bluetooth/btsco
 
 %postun -p /sbin/ldconfig
 

diff --git a/proto-meta-Tizen_generic/specfile-initial/bluetooth-tools/packaging/bluetooth-tools.spec b/proto-meta-Tizen_generic/specfile-initial/bluetooth-tools/packaging/bluetooth-tools.spec
index 6495f86..20439de 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/bluetooth-tools/packaging/bluetooth-tools.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/bluetooth-tools/packaging/bluetooth-tools.spec
@@ -28,11 +28,11 @@ On/Off bluetooth device
 %setup -q
 
 %build
-export CFLAGS+=" -fpie -fvisibility=hidden"
-export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
+export CFLAGS="${CFLAGS} -fpie -fvisibility=hidden"
+export LDFLAGS="${LDFLAGS} -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 
 %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}

diff --git a/proto-meta-Tizen_generic/specfile-initial/efl-theme-tizen/packaging/efl-theme-tizen-hd.spec b/proto-meta-Tizen_generic/specfile-initial/efl-theme-tizen/packaging/efl-theme-tizen-hd.spec
index d37a3af..1bc0db6 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/efl-theme-tizen/packaging/efl-theme-tizen-hd.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/efl-theme-tizen/packaging/efl-theme-tizen-hd.spec
@@ -23,18 +23,18 @@ Development package
 
 
 %build
-export CFLAGS+=" --fPIC"
-export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
+export CFLAGS="${CFLAGS} --fPIC"
+export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=%{_prefix}/lib"
 
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name}
-cp %{buildroot}/usr/share/elementary/themes/tizen-HD-dark.edj %{buildroot}/usr/share/elementary/themes/tizen-hd.edj
+mkdir -p %{buildroot}%{_datadir}/license
+cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}%{_datadir}/license/%{name}
+cp %{buildroot}%{_datadir}/elementary/themes/tizen-HD-dark.edj %{buildroot}%{_datadir}/elementary/themes/tizen-hd.edj
 
 %files
 %defattr(-,root,root,-)
@@ -42,7 +42,7 @@ cp %{buildroot}/usr/share/elementary/themes/tizen-HD-dark.edj %{buildroot}/usr/s
 %{_datadir}/elementary/themes/tizen-HD-light.edj
 %{_datadir}/elementary/themes/tizen-hd.edj
 %manifest %{name}.manifest
-/usr/share/license/%{name}
+%{_datadir}/license/%{name}
 
 %files -n efl-theme-tizen-devel
 %defattr(-,root,root,-)

diff --git a/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec b/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
index e862348..038daf1 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
@@ -2,11 +2,10 @@ Name:       libmm-log
 Summary:    Multimedia Framework LOG Lib
 Version:    0.1.5
 Release:    0
-Group:      Multimedia/Media Service
+Group:      Multimedia/Multimedia Framework
 License:    Apache-2.0
 Source0:    libmm-log-%{version}.tar.gz
 Source1001: libmm-log.manifest
-BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 
 %description
@@ -24,7 +23,7 @@ Multimedia Framework LOG Library (devel)
 cp %{SOURCE1001} .
 
 %build
-export CFLAGS+=" -DUSE_DLOG"
+CFLAGS="$CFLAGS -DUSE_DLOG"; export CFLAGS
 ./autogen.sh
 %configure --disable-static --enable-dlog
 %__make %{?_smp_mflags}

diff --git a/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec b/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec
index 36510ad..af9c82a 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec
@@ -8,13 +8,13 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001: libmm-utility.manifest
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
-BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(mm-common)
 BuildRequires:  pkgconfig(mm-log)
 BuildRequires:  pkgconfig(mm-ta)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  libjpeg-turbo-devel
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 Multimedia Framework Utility Library - Main package.
@@ -40,11 +40,10 @@ Multimedia Framework Utility Library - Tools.
 cp %{SOURCE1001} .
 
 %build
-./autogen.sh
-
+mkdir -p m4
 CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" \
-LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--hash-style=both -Wl,--as-needed" \
-%configure
+LDFLAGS="$LDFLAGS -Wl,--rpath=%{_libdir} -Wl,--hash-style=both -Wl,--as-needed" \
+%reconfigure
 %__make %{?_smp_mflags}
 
 sed -i -e "s#@IMGP_REQPKG@#$IMGP_REQPKG#g" imgp/mmutil-imgp.pc
@@ -65,7 +64,6 @@ rm -rf %{buildroot}
 %license LICENSE LICENSE.APLv2.0
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
-#%%exclude %%{_bindir}/*_testsuite
 
 %files devel
 %manifest %{name}.manifest
@@ -77,3 +75,4 @@ rm -rf %{buildroot}
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/*_testsuite
+

diff --git a/proto-meta-Tizen_generic/specfile-initial/libslp-memo/packaging/libslp-memo.spec b/proto-meta-Tizen_generic/specfile-initial/libslp-memo/packaging/libslp-memo.spec
index 7dfdbf2..512ea49 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/libslp-memo/packaging/libslp-memo.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libslp-memo/packaging/libslp-memo.spec
@@ -30,7 +30,7 @@ Development files for %{name}
 cp %{SOURCE1001} .
 
 %build
-export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--hash-style=both"
+export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--hash-style=both"
 %cmake .
 %__make %{?_smp_mflags}
 

diff --git a/proto-meta-Tizen_generic/specfile-initial/libwbxml2/packaging/libwbxml2.spec b/proto-meta-Tizen_generic/specfile-initial/libwbxml2/packaging/libwbxml2.spec
index 0e8e854..c2b9d37 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libwbxml2/packaging/libwbxml2.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libwbxml2/packaging/libwbxml2.spec
@@ -1,12 +1,12 @@
 Name:           libwbxml2
 Version:        0.11.2
-Release:        0
+Release:        1
 License:        LGPL-2.1+
 Summary:        WBXML parser and compiler library
 Url:            http://libwbxml.opensync.org/
 Group:          System/Libraries
 Source:         libwbxml-%{version}.tar.bz2
-Source1001:     libwbxml2.manifest
+Source1001:    libwbxml2.manifest
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(expat)
@@ -60,23 +60,23 @@ has been defined by the Wap Forum.
 cp %{SOURCE1001} .
 
 %build
-BUILD_SRC=$(pwd)
-
-mkdir -p build
-pushd build
+mkdir build
+CURDIR=$(pwd)
+cd build
 CFLAGS="%{optflags}" \
 CXXFLAGS="%{optflags}" \
 %cmake \
         -DCMAKE_BUILD_TYPE=None \
         -DENABLE_INSTALL_DOC:BOOL=OFF \
-        ${BUILD_SRC}
-%__make %{?_smp_mflags} VERBOSE=1
-popd
+         %{_builddir}/libwbxml-%{version}
+make %{?_smp_mflags} VERBOSE=1
+cd ${CURDIR}
 
 %install
-pushd build
+CURDIR=$(pwd)
+cd build
 %make_install
-popd
+cd ${CURDIR}
 
 %post -p /sbin/ldconfig
 

diff --git a/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec b/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
index e8a5db7..07bcee0 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
@@ -1,24 +1,30 @@
 # For information about rpm conditional builds supports
 #
 #    * http://www.rpm.org/wiki/PackagerDocs/ConditionalBuilds
-%bcond_with    debug
+#
+# WARNING: bcond_without and bcond_with macro are very tricky
+
+#These options are ACTIVATED by default.
 %bcond_without lua
 %bcond_without pulse
 %bcond_without ecore
 %bcond_without glib
-#"qt" macro is for qt4 support
-#that is no longer supported in Tizen
-#for the support of qt5, use the macro "qt5"
-%bcond_with qt
 %bcond_without dbus
 %bcond_without telephony
 %bcond_without audiosession
 %bcond_without websockets
 %bcond_without smack
-%bcond_with    icosyscon
 %bcond_without sysmon
 %bcond_without squashpkg
 
+#These options are DEACTIVATED by default but the prjconf of the OBS project can activate them.
+%bcond_with icosyscon
+#"qt" macro is for qt4 support
+#that is no longer supported in Tizen
+#for the support of qt5, use the macro "qt5"
+%bcond_with qt
+%bcond_with debug
+
 # By default we build with distro-default compilation flags which
 # enables optimizations. If you want to build with full debugging
 # ie. with optimization turned off and full debug info (-O0 -g3)
@@ -29,9 +35,9 @@
 # murphy package.
 
 Summary: Resource policy framework
-Name: murphy
-Version: 0.0.59
-Release: 0
+Name:    murphy
+Version: 0.0.67
+Release: 1
 License: BSD-3-Clause
 Group:   System/Service
 URL:     http://01.org/murphy/
@@ -403,20 +409,20 @@ rm -f %{buildroot}%{_libdir}/murphy/*.la
 
 # Generate list of linkedin plugins (depends on the configuration).
 outdir="`pwd`"
-pushd %{buildroot} >& /dev/null && \
+cd %{buildroot} 
 find ./%{_libdir} -name libmurphy-plugin-*.so* | \
-sed 's#^./*#/#g' > $outdir/filelist.plugins-base && \
-popd >& /dev/null
+sed 's#^./*#/#g' > $outdir/filelist.plugins-base 
+cd $(outdir)
 echo "Found the following linked-in plugin files:"
 cat $outdir/filelist.plugins-base | sed 's/^/    /g'
 
 # Generate list of header files, filtering ones that go to subpackages.
 outdir="`pwd`"
-pushd %{buildroot} >& /dev/null && \
+cd %{buildroot}
 find ./%{_includedir}/murphy | \
 grep -E -v '((pulse)|(ecore)|(glib)|(qt))-glue' | \
-sed 's#^./*#/#g' > $outdir/filelist.devel-includes && \
-popd >& /dev/null
+sed 's#^./*#/#g' > $outdir/filelist.devel-includes 
+cd $(outdir)
 
 # Replace the default sample/test config files with the packaging ones.
 rm -f %{buildroot}%{_sysconfdir}/murphy/*
@@ -433,13 +439,9 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 cp packaging.in/murphyd.conf %{buildroot}%{_tmpfilesdir}
 
 # Copy the systemd files in place.
-mkdir -p %{buildroot}%{_unitdir}
-cp packaging.in/murphyd.service %{buildroot}%{_unitdir}
-%if %{with icosyscon}
-# cp packaging.in/ico-homescreen.service %%{buildroot}%%{_unitdir_user}
-# cp packaging.in/murphy-wait-for-launchpad-ready.path \
-#     %%{buildroot}%%{_unitdir_user}
-%endif
+#mkdir -p %%{buildroot}%%{_unitdir}
+mkdir -p %{buildroot}%{_unitdir_user}
+cp packaging.in/murphyd.service %{buildroot}%{_unitdir_user}
 
 %if %{with dbus}
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
@@ -458,13 +460,13 @@ cp packaging.in/gam-*.names packaging.in/gam-*.tree \
 rm -rf %{buildroot}
 
 %post
-/bin/systemctl enable murphyd.service
+/bin/systemctl --user enable --global murphyd.service
 setcap 'cap_net_admin=+ep' %{_bindir}/murphyd
 ldconfig
 
 %postun
 if [ "$1" = "0" ]; then
-    systemctl disable murphyd.service
+systemctl --user disable --global murphyd.service
 fi
 ldconfig
 
@@ -514,24 +516,6 @@ ldconfig
 ldconfig
 %endif
 
-%if %{with icosyscon}
-%post system-controller
-# prevent system controller from starting
-# rm -f %%{_unitdir_user}/weston.target.wants/ico-uxf-wait-launchpad-ready.path
-# instead launch just ico-homescreen
-# rm -f %%{_unitdir_user}/weston.target.wants/murphy-wait-for-launchpad-ready.path
-# ln -s %%{_unitdir_user}/murphy-wait-for-launchpad-ready.path \
-#     %%{_unitdir_user}/weston.target.wants/murphy-wait-for-launchpad-ready.path
-
-%postun system-controller
-#if [ "$1" = "0" ]; then
-# rm -f %%{_unitdir_user}/weston.target.wants/murphy-wait-for-launchpad-ready.path
-# if [ -f %%{_unitdir_user}/ico-uxf-wait-launchpad-ready.path ]; then
-#     ln -sf %%{_unitdir_user}/ico-uxf-wait-launchpad-ready.path \
-#         %%{_unitdir_user}/weston.target.wants/ico-uxf-wait-launchpad-ready.path
-#fi
-%endif
-
 %post gam
 ldconfig
 
@@ -547,7 +531,7 @@ ldconfig
 %manifest murphy.manifest
 %{_bindir}/murphyd
 %config %{_sysconfdir}/murphy
-%{_unitdir}/murphyd.service
+%{_unitdir_user}/murphyd.service
 %{_tmpfilesdir}/murphyd.conf
 %if %{with audiosession}
 %{_sbindir}/asm-bridge
@@ -713,6 +697,7 @@ ldconfig
 %{_bindir}/resource-client
 %{_bindir}/resource-api-test
 %{_bindir}/resource-api-fuzz
+%{_bindir}/resource-context-create
 %{_bindir}/test-domain-controller
 %{_bindir}/murphy-console
 %manifest murphy.manifest
@@ -726,7 +711,5 @@ ldconfig
 %files system-controller
 %defattr(-,root,root,-)
 %{_libdir}/murphy/plugins/plugin-system-controller.so
-# %%{_unitdir_user}/ico-homescreen.service
-# %%{_unitdir_user}/murphy-wait-for-launchpad-ready.path
 %manifest murphy.manifest
 %endif

diff --git a/proto-meta-Tizen_generic/specfile-initial/nfc-manager-neard/packaging/nfc-manager-neard.spec b/proto-meta-Tizen_generic/specfile-initial/nfc-manager-neard/packaging/nfc-manager-neard.spec
index 53ca61e..075d45c 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/nfc-manager-neard/packaging/nfc-manager-neard.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/nfc-manager-neard/packaging/nfc-manager-neard.spec
@@ -6,7 +6,7 @@ Summary:    NFC framework manager
 Version:    0.1.6
 Release:    0
 Group:      Network & Connectivity/NFC
-License:    Flora
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.service
 Source1001: %{name}.manifest
@@ -20,8 +20,8 @@ BuildRequires:  pkgconfig(security-server)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(bluetooth-api)
 BuildRequires:  pkgconfig(capi-network-wifi)
+BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(mm-sound)
 BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(svi)
@@ -57,11 +57,6 @@ Requires:         nfc-client-lib-neard = %{version}
 Tizen NFC framework manager.
 
 
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-
 %package -n nfc-common-neard-devel
 Summary:    NFC common library (devel)
 Group:      Network & Connectivity/Development
@@ -89,8 +84,6 @@ Requires:   nfc-client-lib-neard = %{version}
 %description -n nfc-client-lib-neard-devel
 NFC manager Client library for developing NFC client applications.
 
-
-
 #%%package -n nfc-client-test
 #Summary:    NFC client test
 #Group:      Network & Connectivity/NFC
@@ -100,6 +93,9 @@ NFC manager Client library for developing NFC client applications.
 #%%description -n nfc-client-test
 #NFC client test (devel)
 
+%prep
+%setup -q
+cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
@@ -132,7 +128,6 @@ if [ $1 == 1 ]; then
     systemctl restart %{name}.service
 fi
 
-
 %post -n nfc-client-lib-neard
 /sbin/ldconfig
 USER_GROUP_ID=$(getent group %{TZ_SYS_USER_GROUP} | cut -d: -f3)
@@ -149,10 +144,8 @@ if [ $1 == 0 ]; then
 fi
 systemctl daemon-reload
 
-
 %postun -n nfc-client-lib-neard -p /sbin/ldconfig
 
-
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -163,14 +156,14 @@ systemctl daemon-reload
 %{_datadir}/dbus-1/system-services/org.tizen.NetNfcService.service
 %{_datadir}/packages/nfc-manager.xml
 %{_datadir}/nfc-manager-daemon/sounds/*
-%license LICENSE.Flora
+%license LICENSE.APLv2
 
 
 %files -n nfc-client-lib-neard
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libnfc.so.*
-%license LICENSE.Flora
+%license LICENSE.APLv2
 
 
 %files -n nfc-client-lib-neard-devel
@@ -185,9 +178,8 @@ systemctl daemon-reload
 %{_libdir}/pkgconfig/nfc-common.pc
 %{_includedir}/nfc-common/*.h
 
-
 #%%files -n nfc-client-test
 #%%manifest nfc-client-test.manifest
 #%%defattr(-,root,root,-)
 #%%{_bindir}/nfc_client
-#%%license LICENSE.Flora
+#%%license LICENSE.APLv2

diff --git a/proto-meta-Tizen_generic/specfile-initial/pulseaudio/packaging/pulseaudio.spec b/proto-meta-Tizen_generic/specfile-initial/pulseaudio/packaging/pulseaudio.spec
index f118632..4989fe5 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/pulseaudio/packaging/pulseaudio.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/pulseaudio/packaging/pulseaudio.spec
@@ -243,14 +243,15 @@ NOCONFIGURE=yes ./bootstrap.sh
 %make_install
 %find_lang %{name}
 
-pushd %{buildroot}%{_sysconfdir}/pulse/filter
+CURDIR=$(pwd)
+cd %{buildroot}%{_sysconfdir}/pulse/filter
 ln -sf filter_8000_44100.dat filter_11025_44100.dat
 ln -sf filter_8000_44100.dat filter_12000_44100.dat
 ln -sf filter_8000_44100.dat filter_16000_44100.dat
 ln -sf filter_8000_44100.dat filter_22050_44100.dat
 ln -sf filter_8000_44100.dat filter_24000_44100.dat
 ln -sf filter_8000_44100.dat filter_32000_44100.dat
-popd
+cd ${CURDIR}
 
 rm -rf  %{buildroot}%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 rm -rf  %{buildroot}%{_bindir}/start-pulseaudio-kde
@@ -291,9 +292,10 @@ fi
 %postun -n libpulse-mainloop-glib -p /sbin/ldconfig
 
 %post   realtime-scheduling
-/usr/sbin/setcap cap_sys_nice+ep /usr/bin/pulseaudio
+setcap cap_sys_nice+ep /usr/bin/pulseaudio
+
 %postun realtime-scheduling
-/usr/sbin/setcap -r /usr/bin/pulseaudio
+setcap -r /usr/bin/pulseaudio
 
 %lang_package
 

diff --git a/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec b/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
index 9ac417e..74241c6 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
@@ -193,7 +193,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm
 chmod 755 %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{rpmhome}/macros.d
 # remove some nonsense or non-working scripts
-pushd %{buildroot}%{rpmhome}/
+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 \
@@ -206,7 +207,7 @@ for i in %{_datadir}/automake-*/*; do
     rm -f "${i##*/}"
   fi
 done
-popd
+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/status/packaging/status.spec b/proto-meta-Tizen_generic/specfile-initial/status/packaging/status.spec
index 0f499c8..6ddfa6d 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/status/packaging/status.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/status/packaging/status.spec
@@ -1,56 +1,57 @@
 Name:       status
-Summary:    status library
+Summary:    Status library
 Version:    0.0.1
-Release:    1
-Group:      TBD
+Release:    0
+Group:      Applications/Core Applications
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    status.manifest
+Source1001:    status.manifest
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(aul)
 BuildRequires: cmake
+BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-Status library.
+Status library files.
 
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
 %package devel
-Summary:    Status library (devel)
+Summary:    Status library (dev)
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Status library (devel).
+Status library (devel) files.
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
+export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{_libdir} -Wl,--as-needed"
 %cmake .
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 %make_install
-
-mkdir -p %{buildroot}/usr/share/license
-cp -f LICENSE %{buildroot}/usr/share/license/%{name}
+mkdir -p %{buildroot}%{_datadir}/license
+cp -f LICENSE %{buildroot}%{_datadir}/license/%{name}
 
 
 %post
+users_gid=$(getent group %{TZ_SYS_USER_GROUP} | cut -f3 -d':')
 init_vconf()
 {
-    vconftool set -t int memory/private/libstatus/music/state 0 -i -g 5000
-    vconftool set -t int memory/private/libstatus/radio/state 0 -i -g 5000
-    vconftool set -t int memory/private/libstatus/vr/state 0 -i -g 5000
-    vconftool set -t int memory/private/libstatus/music/pid -1 -i -g 5000
-    vconftool set -t int memory/private/libstatus/radio/pid -1 -i -g 5000
-    vconftool set -t int memory/private/libstatus/vr/pid -1 -i -g 5000
-    vconftool set -t string memory/private/libstatus/message "" -i -g 5000
+    vconftool set -t int memory/private/libstatus/music/state 0 -i -g $users_gid
+    vconftool set -t int memory/private/libstatus/radio/state 0 -i -g $users_gid
+    vconftool set -t int memory/private/libstatus/vr/state 0 -i -g $users_gid
+    vconftool set -t int memory/private/libstatus/music/pid -1 -i -g $users_gid
+    vconftool set -t int memory/private/libstatus/radio/pid -1 -i -g $users_gid
+    vconftool set -t int memory/private/libstatus/vr/pid -1 -i -g $users_gid
+    vconftool set -t string memory/private/libstatus/message "" -i -g $users_gid
 }
 
 /sbin/ldconfig
@@ -62,11 +63,10 @@ init_vconf
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
-/usr/share/license/%{name}
+%{_datadir}/license/%{name}
 
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/*.h
 %{_libdir}/pkgconfig/*.pc
-

diff --git a/proto-meta-Tizen_generic/specfile-initial/testkit-lite/packaging/testkit-lite.spec b/proto-meta-Tizen_generic/specfile-initial/testkit-lite/packaging/testkit-lite.spec
index af028e8..d609b3b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/testkit-lite/packaging/testkit-lite.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/testkit-lite/packaging/testkit-lite.spec
@@ -54,16 +54,17 @@ sed -i '/^#!/d' ./testkitmerge/merger.py
 
 
 %build
-
+#empty
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 install -d %{buildroot}/%{_datadir}/%{name}
 cp -r xsd %{buildroot}/%{_datadir}/%{name}
 %fdupes %{buildroot}
-pushd %{buildroot}%{python_sitelib}
+CURDIR=$(pwd)
+cd  %{buildroot}%{python_sitelib}
 %py_compile .
-popd
+cd ${CURDIR}
 
 
 %files

diff --git a/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec b/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
index e0bdf16..a2efd25 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
@@ -1,7 +1,7 @@
 %bcond_with wayland
 
 Name:           weekeyboard
-Version:        0.0.2
+Version:        0.0.3
 Release:        0
 License:        Apache-2.0
 Summary:        Virtual Keyboard Application
@@ -32,7 +32,7 @@ ExclusiveArch:
 %endif
 
 %description
-Weekeyboard is virtual keyboard application written in EFL and
+Weekeyboard is a virtual keyboard application written in EFL and
 made for Wayland compositors.
 %prep
 %setup -q
@@ -40,7 +40,7 @@ cp %{SOURCE1001} .
 
 %build
 
-%reconfigure --disable-ibus
+%reconfigure
 make %{?_smp_mflags}
 
 %install
@@ -52,4 +52,4 @@ make %{?_smp_mflags}
 %license COPYING
 %{_bindir}/weekeyboard
 %{_datadir}/weekeyboard/*.edj
-
+%{_datadir}/X11/xkb/symbols/wkb

diff --git a/proto-meta-Tizen_generic/specfile-initial/weston/packaging/weston.spec b/proto-meta-Tizen_generic/specfile-initial/weston/packaging/weston.spec
index 9781f10..428b37b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/weston/packaging/weston.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/weston/packaging/weston.spec
@@ -14,10 +14,6 @@
 %define extra_config_options3 --enable-sys-uid
 %endif
 
-%if "%{profile}" == "ivi"
-%define extra_config_options4 --enable-multiseat
-%endif
-
 Name:           weston
 Version:        1.6.0
 Release:        0
@@ -29,7 +25,8 @@ 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
-Source1001:     %name.manifest
+Source1:        %name.target
+Source1001:    %name.manifest
 BuildRequires: autoconf >= 2.64, automake >= 1.11
 BuildRequires:  expat-devel
 BuildRequires:  libjpeg-devel
@@ -124,8 +121,7 @@ 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_options4:%extra_config_options4}
+         %{?extra_config_options3:%extra_config_options3}
 
 make %{?_smp_mflags}
 
@@ -156,6 +152,8 @@ 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
@@ -190,6 +188,7 @@ 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