Cleanup packaging

- use %license to install licenses
- Do not hardcode compile options
- remove exec flag from source files
- Set package group correctly
- manifest should be in packaging/

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/LICENSE.APLv2 b/LICENSE.APLv2
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/NOTICE b/NOTICE
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/osp-speech.manifest b/osp-speech.manifest
deleted file mode 100644 (file)
index ae3e6f7..0000000
--- a/osp-speech.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>
\ No newline at end of file

diff --git a/osp-speech.pc.in b/osp-speech.pc.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/osp-speech.manifest b/packaging/osp-speech.manifest
new file mode 100644 (file)
index 0000000..ae3e6f7
--- /dev/null
+++ b/packaging/osp-speech.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>
\ No newline at end of file

diff --git a/packaging/osp-speech.spec b/packaging/osp-speech.spec
index f1c5846a4e15f4a0428b9c8bbda52bac9c767f19..75b3afbb7c4ce7a6b6eedbb969985c1d7e356ed2 100755 (executable)
--- a/packaging/osp-speech.spec
+++ b/packaging/osp-speech.spec
@@ -1,37 +1,34 @@
-Name:          osp-speech
-Summary:       osp speech library
-Version:       1.2.1.0
-Release:       2
-Group:         System/Libraries
-License:       TO_BE/FILLED_IN
-Source0:       %{name}-%{version}.tar.gz
+Name:           osp-speech
+Version:        1.2.1.0
+Release:        2
+License:        Apache-2.0
+Summary:        OSP speech library
+Group:          Graphics & UI Framework/Voice Framework
+Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
+BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  pkgconfig(stt)
 BuildRequires:  pkgconfig(tts)
-BuildRequires:  pkgconfig(osp-appfw)
-BuildRequires:  osp-appfw-internal-devel
 
-# runtime requires
-Requires: osp-appfw
+Requires:       osp-appfw
 
 %description
-osp speech library
+OSP speech library
 
 %package devel
-Summary:    osp speech library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        OSP speech library (Development)
+Requires:       %{name} = %{version}
 
 %description devel
-osp speech library (DEV)
+OSP speech library (DEV)
 
 %package internal-devel
-Summary:    osp speech library (Internal)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        OSP speech library (Internal)
+Requires:       %{name} = %{version}
 
 %description internal-devel
-osp speech library (Internal-DEV)
+OSP speech library (Internal-DEV)
 
 %prep
 %setup -q
@@ -39,19 +36,13 @@ osp speech library (Internal-DEV)
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %ifarch %{ix86}
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" %cmake .  -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %else
-CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %endif
-
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
-
 %make_install
 
 %post -p /sbin/ldconfig
@@ -60,7 +51,7 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license
 
 %files
 %manifest osp-speech.manifest
-/usr/share/license/%{name}
+%license LICENSE.APLv2
 %{_libdir}/osp/*.so*
 
 %files devel