From 8bc3ae4287750aa406b5a04a1d6debd9f523b66f Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 24 Sep 2013 03:58:35 -0400
Subject: fixed packaging

- fixed license/groups
- Do not hardcode optflags
- install manifest in spec

Change-Id: Id54cb5d58e06163ea6f4dbab96c71fe82cec5042
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 osp-location.manifest            |  5 ----
 packaging/osp-locations.manifest |  5 ++++
 packaging/osp-locations.spec     | 50 +++++++++++++++++-----------------------
 3 files changed, 26 insertions(+), 34 deletions(-)
 delete mode 100644 osp-location.manifest
 create mode 100644 packaging/osp-locations.manifest

diff --git a/osp-location.manifest b/osp-location.manifest
deleted file mode 100644
index ae3e6f7..0000000
--- a/osp-location.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-</manifest>
\ No newline at end of file
diff --git a/packaging/osp-locations.manifest b/packaging/osp-locations.manifest
new file mode 100644
index 0000000..ae3e6f7
--- /dev/null
+++ b/packaging/osp-locations.manifest
@@ -0,0 +1,5 @@
+<manifest>
+	<request>
+		<domain name="_"/>
+	</request>
+</manifest>
\ No newline at end of file
diff --git a/packaging/osp-locations.spec b/packaging/osp-locations.spec
index f6200d8..7d433f8 100644
--- a/packaging/osp-locations.spec
+++ b/packaging/osp-locations.spec
@@ -1,62 +1,55 @@
-Name:		osp-locations
-Summary:	The Locations library of OSP
-Version:	1.2.2.1
-Release:	2
-Group:		System/Libraries
-License:	Apache License, Version 2
-Source0:	%{name}-%{version}.tar.gz
+Name:           osp-locations
+Version:        1.2.2.1
+Release:        2
+License:        Apache-2.0
+Summary:        The Locations library of OSP
+Group:          Location/Libraries
+Source0:        %{name}-%{version}.tar.gz
+Source1001:     %{name}.manifest
 BuildRequires:  cmake
+BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  osp-uifw-internal-devel
 BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(capi-location-manager)
 BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  pkgconfig(osp-uifw)
-BuildRequires:  osp-appfw-internal-devel
-BuildRequires:  osp-uifw-internal-devel
 
 # runtime requires
-Requires: osp-appfw
-Requires: osp-uifw
-
-Provides: libosp-locations.so.1
+Requires:       osp-appfw
+Requires:       osp-uifw
 
 %description
 The Locations library of OSP
 
 %package devel
-Summary:    The Locations library of OSP (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        The Locations library of OSP (Development)
+Requires:       %{name} = %{version}
 
 %description devel
 The Locations library of OSP (DEV)
 
 %package internal-devel
-Summary:    The Locations library of OSP (Internal Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        The Locations library of OSP (Internal Development)
+Requires:       %{name} = %{version}
 
 %description internal-devel
 The Locations 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="-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  %{buildroot}/usr/share/license/%{name}
-
 %make_install
 
 %post -p /sbin/ldconfig
@@ -65,11 +58,10 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license
 
 %files
 %manifest osp-location.manifest
-/usr/share/license/%{name}
+%license LICENSE.APLv2
 %{_libdir}/osp/*.so*
 
 %files devel
 %{_includedir}/osp/*.h
 %{_libdir}/pkgconfig/osp-locations.pc
 
-%files internal-devel
-- 
cgit v1.2.3