From f2dcdfcfc7ea17de78acf800cc0baf840939fda0 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 17 Sep 2013 02:01:26 -0400 Subject: [PATCH] Fixed packaging - Do not install license in cmake, use %license - Use find_lang macro to install locale files Change-Id: I43065a2a11220624b5c8859a320f49c4be1f31d1 Signed-off-by: Anas Nashif --- CMakeLists.txt | 1 - LICENSE.Flora | 0 libug-calendar-efl.xml | 0 org.tizen.calendar.desktop.in | 0 org.tizen.calendar.manifest | 0 packaging/org.tizen.calendar.spec | 26 ++++++++------------------ ug/CMakeLists.txt | 1 - viewer/CMakeLists.txt | 1 - viewer/viewer.c | 0 9 files changed, 8 insertions(+), 21 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 LICENSE.Flora mode change 100755 => 100644 libug-calendar-efl.xml mode change 100755 => 100644 org.tizen.calendar.desktop.in mode change 100755 => 100644 org.tizen.calendar.manifest mode change 100755 => 100644 ug/CMakeLists.txt mode change 100755 => 100644 viewer/CMakeLists.txt mode change 100755 => 100644 viewer/viewer.c diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index 20e24fc..421bccf --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,5 +113,4 @@ INSTALL(DIRECTORY DESTINATION ${DATADIR}) # vcs viewer ADD_SUBDIRECTORY(viewer) -INSTALL(FILES ${CMAKE_BINARY_DIR}/LICENSE.Flora DESTINATION /usr/share/license RENAME ${PKGNAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.rule DESTINATION /etc/smack/accesses.d) diff --git a/LICENSE.Flora b/LICENSE.Flora old mode 100755 new mode 100644 diff --git a/libug-calendar-efl.xml b/libug-calendar-efl.xml old mode 100755 new mode 100644 diff --git a/org.tizen.calendar.desktop.in b/org.tizen.calendar.desktop.in old mode 100755 new mode 100644 diff --git a/org.tizen.calendar.manifest b/org.tizen.calendar.manifest old mode 100755 new mode 100644 diff --git a/packaging/org.tizen.calendar.spec b/packaging/org.tizen.calendar.spec index 7899789..90bb152 100755 --- a/packaging/org.tizen.calendar.spec +++ b/packaging/org.tizen.calendar.spec @@ -62,28 +62,20 @@ Calendar UI gadget (EFL). export LANG="en_US.utf8" -cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} +%cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} make %{?jobs:-j%jobs} %install -mkdir -p %{buildroot}/usr/share/license -rm -rf %{buildroot} %make_install +%find_lang calendar + %post -n libug-calendar-efl +/sbin/ldconfig mkdir -p /usr/ug/bin/ ln -sf /usr/bin/ug-client /usr/ug/bin/calendar-efl ln -sf /usr/bin/ug-client /usr/ug/bin/calendar-detail-efl -# Automatically added by dh_makeshlibs -if [ "$1" = "configure" ]; then - ldconfig -fi -# End automatically added section - -# 5000 is inhouse user id -# do not use relative path - vconftool set -t int db/private/org.tizen.calendar/focusview 0 -u 5000 vconftool set -t int db/private/org.tizen.calendar/send 0 -u 5000 vconftool set -t int db/private/org.tizen.calendar/timezone_on_off 0 -u 5000 @@ -101,29 +93,27 @@ mkdir -p /usr/data/ug-calendar chgrp 6003 /usr/data/ug-calendar chmod 770 /usr/data/ug-calendar -%postun -%files -n org.tizen.calendar +%files -n org.tizen.calendar -f calendar.lang %manifest org.tizen.calendar.manifest +%license LICENSE.Flora %defattr(-,root,root,-) /usr/apps/org.tizen.calendar/bin/calendar /usr/apps/org.tizen.calendar/data/ -/usr/apps/org.tizen.calendar/res/locale/* /usr/apps/org.tizen.calendar/res/edje/*.edj /usr/share/packages/org.tizen.calendar.xml /usr/share/icons/default/small/org.tizen.calendar.png -/usr/share/license/%{name} %config /etc/smack/accesses.d/%{name}.rule %files -n org.tizen.calendar-viewer %manifest viewer/org.tizen.calendar-viewer.manifest +%license LICENSE.Flora %defattr(-,root,root,-) /usr/apps/org.tizen.calendar-viewer/bin/calendar-viewer /usr/share/packages/org.tizen.calendar-viewer.xml -/usr/share/license/org.tizen.calendar-viewer %files -n libug-calendar-efl +%license LICENSE.Flora %defattr(-,root,root,-) /usr/ug/lib/*.so /usr/share/packages/libug-calendar-efl.xml -/usr/share/license/libug-calendar-efl diff --git a/ug/CMakeLists.txt b/ug/CMakeLists.txt old mode 100755 new mode 100644 index cd72102..23164f7 --- a/ug/CMakeLists.txt +++ b/ug/CMakeLists.txt @@ -25,4 +25,3 @@ ADD_SUBDIRECTORY(edit) ADD_SUBDIRECTORY(detail) ADD_SUBDIRECTORY(list) -INSTALL(FILES ${CMAKE_BINARY_DIR}/LICENSE.Flora DESTINATION /usr/share/license RENAME libug-calendar-efl) diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt old mode 100755 new mode 100644 index d88affd..d1773dd --- a/viewer/CMakeLists.txt +++ b/viewer/CMakeLists.txt @@ -44,4 +44,3 @@ INSTALL(TARGETS ${VIEWER} DESTINATION ${VC_BINDIR}) CONFIGURE_FILE(${VIEWER}.xml ${CMAKE_BINARY_DIR}/${VC_PKGNAME}.xml) INSTALL(FILES ${CMAKE_BINARY_DIR}/${VC_PKGNAME}.xml DESTINATION "/usr/share/packages") -INSTALL(FILES ${CMAKE_BINARY_DIR}/LICENSE.Flora DESTINATION /usr/share/license RENAME ${VC_PKGNAME}) diff --git a/viewer/viewer.c b/viewer/viewer.c old mode 100755 new mode 100644 -- 2.7.4