fixed packaging

- install manifest in spec file
- fixed package group/license
- remove exec flag from file in git repo

Change-Id: I0113c6d911109cebb3a58fb5173dc845fa8cb453
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.0 b/LICENSE.APLv2.0
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-image.pc.in b/osp-image.pc.in
old mode 100755 (executable)
new mode 100644 (file)

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

diff --git a/packaging/osp-image.spec b/packaging/osp-image.spec
old mode 100755 (executable)
new mode 100644 (file)
index f907d93..9036dda
--- a/packaging/osp-image.spec
+++ b/packaging/osp-image.spec
@@ -1,77 +1,67 @@
-Name:       osp-image
-Summary:    The Media Image library of OSP
-Version:    1.2.2.0
-Release:    1
-Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
-Source0:    %{name}-%{version}.tar.gz
+Name:           osp-image
+Version:        1.2.2.0
+Release:        1
+License:        Apache-2.0
+Summary:        The Media Image library of OSP
+Group:          Graphics & UI Framework/Libraries
+Source0:        %{name}-%{version}.tar.gz
+Source1001:     %{name}.manifest
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  osp-appfw-internal-devel
-BuildRequires:  pkgconfig(osp-image-core)
 BuildRequires:  osp-image-core-internal-devel
-BuildRequires:  pkgconfig(osp-uifw)
-BuildRequires:  osp-uifw-internal-devel
-BuildRequires:  pkgconfig(osp-net)
 BuildRequires:  osp-net-internal-devel
-BuildRequires:  pkgconfig(openssl)
+BuildRequires:  osp-uifw-internal-devel
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libwbxml2)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(osp-appfw)
+BuildRequires:  pkgconfig(osp-image-core)
+BuildRequires:  pkgconfig(osp-net)
+BuildRequires:  pkgconfig(osp-uifw)
 
 # runtime requires
-Requires: osp-appfw
-Requires: osp-image-core
-Requires: osp-uifw
-Requires: osp-net
-
-Provides:   libosp-image.so.1
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires:       osp-appfw
+Requires:       osp-image-core
+Requires:       osp-net
+Requires:       osp-uifw
 
 %description
 The Media Image library of OSP
 
 %package devel
-Summary:    The Media Image library of OSP (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        The Media Image library of OSP (Development)
+Requires:       %{name} = %{version}
 
 %description devel
 The Media Image library of OSP (DEV)
 
 %package internal-devel
-Summary:    osp media image internel (Internal)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        osp media image internel (Internal)
+Requires:       %{name} = %{version}
 
 %description internal-devel
 The Media Image library of OSP (Internal-DEV)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %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} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" %cmake .  -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
 %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} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" %cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
 %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.0  %{buildroot}/usr/share/license/%{name}
-
 %make_install
 
 %post -p /sbin/ldconfig
@@ -80,7 +70,6 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0  %{buildroot}/usr/share/licen
 
 %files
 %manifest osp-image.manifest
-/usr/share/license/%{name}
 %{_libdir}/osp/libosp-image.so*
 
 %files devel