From 175b46e4e93530efcda4198fcdb132a6b7f0f091 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 17 Sep 2013 03:32:06 -0400 Subject: [PATCH] cleanup spec file - fixed package groups - fixed license installation - fixed desscriptions Change-Id: If6935968c21c6e7908db1116d8f7fb87e270cb70 Signed-off-by: Anas Nashif --- CMakeLists.txt | 0 osp-telephony.pc.in | 0 packaging/osp-telephony.spec | 60 +++++++++++++++++++------------------------- 3 files changed, 26 insertions(+), 34 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 osp-telephony.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/osp-telephony.pc.in b/osp-telephony.pc.in old mode 100755 new mode 100644 diff --git a/packaging/osp-telephony.spec b/packaging/osp-telephony.spec index ad72f9d..2795dd7 100755 --- a/packaging/osp-telephony.spec +++ b/packaging/osp-telephony.spec @@ -1,44 +1,41 @@ -Name: osp-telephony -Summary: osp telephony library -Version: 1.2.1.0 -Release: 2 -Group: System/Libraries -License: Apache License, Version 2.0 -Source0: %{name}-%{version}.tar.gz +Name: osp-telephony +Version: 1.2.1.0 +Release: 2 +License: Apache-2.0 +Summary: OSP Telephony library +Group: Telephony/Libraries +Source0: %{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: pkgconfig(chromium) -BuildRequires: pkgconfig(capi-telephony-sim) -BuildRequires: pkgconfig(capi-telephony-network-info) +BuildRequires: osp-appfw-internal-devel +BuildRequires: osp-net-internal-devel BuildRequires: pkgconfig(capi-network-connection) +BuildRequires: pkgconfig(capi-telephony-network-info) +BuildRequires: pkgconfig(capi-telephony-sim) +BuildRequires: pkgconfig(chromium) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(tapi) BuildRequires: pkgconfig(osp-appfw) -BuildRequires: osp-appfw-internal-devel BuildRequires: pkgconfig(osp-net) -BuildRequires: osp-net-internal-devel +BuildRequires: pkgconfig(tapi) -# runtime requires -Requires: osp-appfw -Requires: osp-net +Requires: osp-appfw +Requires: osp-net %description -osp telephony library +OSP Telephony library %package devel -Summary: osp telephony library (Development) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Summary: OSP Telephony library (Development) +Requires: %{name} = %{version} %description devel -osp telephony library (DEV) +OSP Telephony library (DEV) %package internal-devel -Summary: osp telephony library (Internal) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Summary: OSP Telephony library (Internal) +Requires: %{name} = %{version} %description internal-devel -osp telephony library (Internal-DEV) +OSP Telephony library (Internal-DEV) %prep %setup -q @@ -46,19 +43,14 @@ osp telephony 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 @@ -67,7 +59,7 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license %files %manifest osp-telephony.manifest -/usr/share/license/%{name} +%license LICENSE.APLv2 %{_libdir}/osp/*.so* %files devel -- 2.7.4