fixed packaging

- install manifest using spec
- use %find_lang macro
- use %cmake macro
- Fixed group/license

Change-Id: Ia5f3aa9001a4767aae7b16968b343ca488724a99
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/org.tizen.music-player.manifest b/packaging/org.tizen.music-player.manifest
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from org.tizen.music-player.manifest
rename to packaging/org.tizen.music-player.manifest

diff --git a/packaging/org.tizen.music-player.spec b/packaging/org.tizen.music-player.spec
old mode 100755 (executable)
new mode 100644 (file)
index ee732f5..7447afa
--- a/packaging/org.tizen.music-player.spec
+++ b/packaging/org.tizen.music-player.spec
@@ -1,11 +1,13 @@
 %define PKG_PREFIX org.tizen
 
 Name:       org.tizen.music-player
-Summary:    music player application
+Summary:    Music Player Application
 Version:    0.1.177
 Release:    1
 License:    Flora
 Source0:    %{name}-%{version}.tar.gz
+Source1001: org.tizen.music-player.manifest
+Group:      Applications/Core Applications
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(ecore)
@@ -46,26 +48,24 @@ BuildRequires:  gettext-tools
 Requires:  media-server email-service media-data-sdk ug-bluetooth-efl
 
 %description
-music player application.
+Music Player Application.
 
 %package -n %{PKG_PREFIX}.sound-player
 Summary:    Sound player
 
 %description -n %{PKG_PREFIX}.sound-player
-Description: sound player application
-
-#Requires:   %{name} = %{version}-%{release}
+Sound Player Application
 
 %package -n ug-music-player-efl
-Summary:    music-player UG
-Group:      TO_BE/FILLED_IN
+Summary:    Music Player UG
 
 %description -n ug-music-player-efl
-Description: music-player UG
+Music Player UG
 
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %define DESKTOP_DIR /usr/share
 %define INSTALL_DIR    /usr/apps
@@ -82,15 +82,17 @@ Description: music-player UG
 %define UG_PREFIX /usr/ug
 
 %build
-cmake . -DUG_PREFIX="%{UG_PREFIX}" -DINSTALL_DIR="%{INSTALL_DIR}" -DCMAKE_INSTALL_PREFIX="%{PREFIX}" -DCMAKE_DESKTOP_ICON_DIR="%{DESKTOP_DIR}/icons/default/small" -DDESKTOP_DIR="%{DESKTOP_DIR}" -DPKG_NAME="%{PKG_NAME}" -DSP_PKG_NAME="%{SP_PKG_NAME}" -DDATA_PREFIX="%{DATA_PREFIX}" -DSP_DATA_PREFIX="%{SP_DATA_PREFIX}"
+%cmake . -DUG_PREFIX="%{UG_PREFIX}" -DINSTALL_DIR="%{INSTALL_DIR}" -DCMAKE_INSTALL_PREFIX="%{PREFIX}" -DCMAKE_DESKTOP_ICON_DIR="%{DESKTOP_DIR}/icons/default/small" -DDESKTOP_DIR="%{DESKTOP_DIR}" -DPKG_NAME="%{PKG_NAME}" -DSP_PKG_NAME="%{SP_PKG_NAME}" -DDATA_PREFIX="%{DATA_PREFIX}" -DSP_DATA_PREFIX="%{SP_DATA_PREFIX}"
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 execstack -c %{buildroot}%{PREFIX}/bin/music-player
 
+
+%find_lang music-player
+
 %pre
 if [ -n "`env|grep SBOX`" ]; then
         echo "postinst: sbox installation"
@@ -140,23 +142,26 @@ ln -sf /usr/bin/ug-client /usr/ug/bin/music-player-efl
 /usr/bin/vconftool set -t int memory/private/org.tizen.music-player/playing_pid 0 -i -g 5000
 
 
-%files
+%files -f music-player.lang
+%license NOTICE.Flora
 %manifest %{name}.manifest
 %{DESKTOP_DIR}/packages/%{name}.xml
 %{DESKTOP_DIR}/icons/default/small/%{name}.png
 %{PREFIX}/bin/music-player
-%{PREFIX}/res/locale/*/LC_MESSAGES/*.mo
 %{PREFIX}/res/images/*
 %{PREFIX}/res/edje/*.edj
 /opt/etc/smack/accesses.d/org.tizen.music-player.rule
-
 %{DESKTOP_DIR}/icons/default/small/%{SP_PKG_NAME}.png
 %{SP_PREFIX}/bin/sound-player
 
+%post -n ug-music-player-efl -p /sbin/ldconfig
+
+%postun -n ug-music-player-efl -p /sbin/ldconfig
+
 %files -n ug-music-player-efl
+%defattr(-,root,root,-)
 %manifest ug-music-player-efl.manifest
 %{DESKTOP_DIR}/packages/ug-music-player-efl.xml
-%defattr(-,root,root,-)
 %{UG_PREFIX}/lib/libug-music-player-efl.so
 %{UG_PREFIX}/lib/libug-music-player-efl.so.0.1.0
 %{UG_PREFIX}/res/edje/ug-music-player-efl/ug-music-player-efl.edj