diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-09-24 03:58:35 -0400 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-09-24 03:59:27 -0400 |
| commit | 8bc3ae4287750aa406b5a04a1d6debd9f523b66f (patch) | |
| tree | cf7cb95d582109cece1c063133a5eaa6286e4efe | |
| parent | 6f5460ebbb30f00d8f9194fabafa00fd19ef38cf (diff) | |
| download | locations-8bc3ae4287750aa406b5a04a1d6debd9f523b66f.tar.gz locations-8bc3ae4287750aa406b5a04a1d6debd9f523b66f.tar.bz2 locations-8bc3ae4287750aa406b5a04a1d6debd9f523b66f.zip | |
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>
| -rw-r--r-- | packaging/osp-locations.manifest (renamed from osp-location.manifest) | 0 | ||||
| -rw-r--r-- | packaging/osp-locations.spec | 50 |
2 files changed, 21 insertions, 29 deletions
diff --git a/osp-location.manifest b/packaging/osp-locations.manifest index ae3e6f7..ae3e6f7 100644 --- a/osp-location.manifest +++ b/packaging/osp-locations.manifest 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 |