From 473a35f086f45455c8dd3d70d54f785119d6361d Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 15 Jul 2014 17:29:59 +0200 Subject: [PATCH] Update init specfile. Change-Id: Id2b0345c9108735174bd3aa3e281aa5171927069 Signed-off-by: Ronan Le Martret --- .../packaging/libprivilege-control.spec | 41 ++++++++++------------ .../privacy-manager/packaging/privacy-manager.spec | 1 + 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/proto-meta-Tizen_generic/specfile-initial/libprivilege-control/packaging/libprivilege-control.spec b/proto-meta-Tizen_generic/specfile-initial/libprivilege-control/packaging/libprivilege-control.spec index b1e5657..c3181de 100644 --- a/proto-meta-Tizen_generic/specfile-initial/libprivilege-control/packaging/libprivilege-control.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libprivilege-control/packaging/libprivilege-control.spec @@ -1,7 +1,7 @@ Name: libprivilege-control Summary: Library to control privilege of application Version: 0.0.43.TIZEN -Release: 1 +Release: 0 Group: Security/Access Control License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -31,7 +31,6 @@ Requires: %{name} = %{version}-%{release} %description conf Library to control privilege of application files - %prep %setup -q cp %{SOURCE1001} . @@ -46,30 +45,28 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration" %cmake . -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DTZ_SYS_DB=%TZ_SYS_DB \ - -DTZ_SYS_HOME=%TZ_SYS_HOME + -DTZ_SYS_DB=%TZ_SYS_DB \ + -DTZ_SYS_HOME=%TZ_SYS_HOME \ + -DTZ_SYS_ETC=%TZ_SYS_ETC -VERBOSE=1 make %{?jobs:-j%jobs} +VERBOSE=1 %__make %{?jobs:-j%jobs} %install %make_install -mkdir -p %{buildroot}/usr/share/privilege-control/ - -mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -ln -sf /usr/lib/systemd/system/smack-rules.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/smack-rules.service +mkdir -p %{buildroot}%{_datadir}/privilege-control/ +mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants +ln -sf %{_libdir}/systemd/system/smack-rules.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/smack-rules.service mkdir -p %{buildroot}%{TZ_SYS_DB} - sed -i 's|TZ_SYS_DB|%{TZ_SYS_DB}|g' %{SOURCE1001} %post /sbin/ldconfig - -/usr/share/privilege-control/db/updater.sh +%{TZ_SYS_SHARE}/privilege-control/db/updater.sh chsmack -a 'System' %{TZ_SYS_DB}/.rules-db.db3* %postun -p /sbin/ldconfig -api_feature_loader --verbose --dir=/usr/share/privilege-control/ +api_feature_loader --verbose --dir=%{_datadir}/privilege-control/ %check ./db/updater.sh --check-files %{buildroot} @@ -80,16 +77,16 @@ api_feature_loader --verbose --dir=/usr/share/privilege-control/ %{_libdir}/*.so.* %{_libdir}/librules-db-sql-udf.so #systemd service -/usr/lib/systemd/system/smack-rules.service -/usr/bin/api_feature_loader +%{_libdir}/systemd/system/smack-rules.service +%{_bindir}/api_feature_loader #link to activate systemd service -/usr/lib/systemd/system/multi-user.target.wants/smack-rules.service -/usr/share/privilege-control/db/rules-db.sql -/usr/share/privilege-control/db/rules-db-data.sql -/usr/share/privilege-control/db/updater.sh -/usr/share/privilege-control/db/updates/* -/usr/share/privilege-control/db/load-rules-db.sql -/etc/opt/upgrade/220.libprivilege-updater.patch.sh +%{_libdir}/systemd/system/multi-user.target.wants/smack-rules.service +%{_datadir}/privilege-control/db/rules-db.sql +%{_datadir}/privilege-control/db/rules-db-data.sql +%{_datadir}/privilege-control/db/updater.sh +%{_datadir}/privilege-control/db/updates/* +%{_datadir}/privilege-control/db/load-rules-db.sql +%{TZ_SYS_ETC}/opt/upgrade/220.libprivilege-updater.patch.sh %attr(755, root, root) %dir %{TZ_SYS_DB} %files conf diff --git a/proto-meta-Tizen_generic/specfile-initial/privacy-manager/packaging/privacy-manager.spec b/proto-meta-Tizen_generic/specfile-initial/privacy-manager/packaging/privacy-manager.spec index 99057f6..99c211a 100644 --- a/proto-meta-Tizen_generic/specfile-initial/privacy-manager/packaging/privacy-manager.spec +++ b/proto-meta-Tizen_generic/specfile-initial/privacy-manager/packaging/privacy-manager.spec @@ -115,6 +115,7 @@ then %{_bindir}/privacy_manager_create_clean_db.sh fi chsmack -a 'User' %{TZ_SYS_DB}/.privacy.db* +chsmack -a 'User' %{TZ_SYS_DB}/.privacylist.db* %postun -p /sbin/ldconfig -- 2.7.4