diff options
| author | gs86.lee <gs86.lee@samsung.com> | 2013-10-01 16:17:01 +0900 |
|---|---|---|
| committer | gs86.lee <gs86.lee@samsung.com> | 2013-10-01 16:17:01 +0900 |
| commit | 6b8cfe5214fc4669b28f3d36b7c02f408ce8d6f9 (patch) | |
| tree | fba3ef3ac236b231de0ef8c1ace030d532a55a37 | |
| parent | 21a4b8110fa6025f56b4c625bed3acc662c0564b (diff) | |
| parent | dfbccd7b4bc6ebdac91ef4b3c1c5c93fc1b6915d (diff) | |
| download | starter-6b8cfe5214fc4669b28f3d36b7c02f408ce8d6f9.tar.gz starter-6b8cfe5214fc4669b28f3d36b7c02f408ce8d6f9.tar.bz2 starter-6b8cfe5214fc4669b28f3d36b7c02f408ce8d6f9.zip | |
Merge branch 'master' into tizen_2.2submit/tizen_2.2/20131107.0626362.2.1_releasetizen_2.2
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/starter.spec | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d0cd55..f21fbef 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,4 +98,4 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/starter.rule DESTINATION /opt/etc/smack/access INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/starter.service DESTINATION /usr/lib/systemd/user) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/starter.socket DESTINATION /usr/lib/systemd/user) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/starter.path DESTINATION /usr/lib/systemd/user) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.Flora DESTINATION /usr/share/license/starter) +#INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.Flora DESTINATION /usr/share/license/starter) diff --git a/packaging/starter.spec b/packaging/starter.spec index d79bc9a..965f4d9 100644 --- a/packaging/starter.spec +++ b/packaging/starter.spec @@ -65,6 +65,8 @@ ln -s ../starter.socket %{buildroot}%{_libdir}/systemd/user/sockets.target.wants mkdir -p %{buildroot}/usr/share/license mkdir -p %{buildroot}/opt/data/home-daemon +cp LICENSE.Flora %{buildroot}/usr/share/license/%{name} + %post change_file_executable() { |