summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-05-29 08:14:30 -0400
committerAnas Nashif <anas.nashif@intel.com>2013-05-29 08:14:30 -0400
commit47eb4b804c4c378c160577dab3f8bbbf5a2d118c (patch)
tree4ed0e691690d02ca9149a920093533bd6357bc5c
parent520eeab842326e3141168033875c1d801d61b53b (diff)
downloadprivacy-manager-47eb4b804c4c378c160577dab3f8bbbf5a2d118c.tar.gz
privacy-manager-47eb4b804c4c378c160577dab3f8bbbf5a2d118c.tar.bz2
privacy-manager-47eb4b804c4c378c160577dab3f8bbbf5a2d118c.zip
-rw-r--r--packaging/privacy-manager.changes3
-rwxr-xr-xpackaging/privacy-manager.spec18
2 files changed, 11 insertions, 10 deletions
diff --git a/packaging/privacy-manager.changes b/packaging/privacy-manager.changes
index 9a7098b..821097e 100644
--- a/packaging/privacy-manager.changes
+++ b/packaging/privacy-manager.changes
@@ -1,3 +1,6 @@
+* Wed May 29 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.103512@520eeab
+- Install systemd unit files in unitdir
+
* Sat May 18 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130518.173311@005c01c
- fix hardcoding in cmake files
diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index d9385f7..fcded9b 100755
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -2,7 +2,7 @@ Name: privacy-manager-server
Summary: Privacy Management
Version: 0.0.3
Release: 1
-Group: System/Libraries
+Group: Security/Libraries
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
Source1: privacy-manager-server.service
@@ -102,10 +102,6 @@ make %{?jobs:-j%jobs}
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/privacy-manager-server
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/privacy-manager-client
mkdir -p %{buildroot}/usr/bin
cp res/usr/bin/* %{buildroot}/usr/bin/
mkdir -p %{buildroot}/opt/dbspace
@@ -113,9 +109,9 @@ cp res/opt/dbspace/.privacylist.db /%{buildroot}/opt/dbspace/
%make_install
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
-ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/privacy-manager-server.service
+ln -sf %{_unitdir}/privacy-manager-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/privacy-manager-server.service
%post -n privacy-manager-server
@@ -139,21 +135,21 @@ fi
%postun -n capi-security-privacy-manager -p /sbin/ldconfig
%files -n privacy-manager-server
+%license LICENSE.APLv2
%defattr(-,root,root,-)
%manifest packaging/privacy-manager-server.manifest
%{_bindir}/*
%{_prefix}/lib/systemd/*
-/usr/share/license/privacy-manager-server
/opt/dbspace/.privacylist.db
%files -n privacy-manager-server-devel
%{_libdir}/pkgconfig/privacy-manager-server.pc
%files -n privacy-manager-client
+%license LICENSE.APLv2
%defattr(-,root,root,-)
%manifest packaging/privacy-manager-client.manifest
%{_libdir}/libprivacy-manager-client.so*
-/usr/share/license/privacy-manager-client
/etc/package-manager/parserlib/libprivileges.so
%files -n privacy-manager-client-devel
@@ -164,6 +160,7 @@ fi
%files -n capi-security-privacy-manager
+%license LICENSE.APLv2
%{_libdir}/libcapi-security-privacy-manager.so.*
%manifest packaging/capi-security-privacy-manager.manifest
@@ -173,6 +170,7 @@ fi
%{_libdir}/pkgconfig/capi-security-privacy-manager.pc
%files -n tizenprv00.privacy-popup
+%license LICENSE.APLv2
%manifest packaging/tizenprv00.privacy-popup.manifest
%defattr(-,root,root,-)
/usr/bin/tizenprv00.privacy-popup