fixed packaging

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

diff --git a/packaging/osp-connectivity-service.spec b/packaging/osp-connectivity-service.spec
index 3c556a7..e61e8c6 100755 (executable)
--- a/packaging/osp-connectivity-service.spec
+++ b/packaging/osp-connectivity-service.spec
@@ -1,68 +1,63 @@
-Name:          osp-connectivity-service
-Summary:       osp connectivity service
-Version:       1.2.1.0
-Release:       2
-Group:         TO_BE/FILLED_IN
-License:       TO_BE/FILLED_IN
-Source0:       %{name}-%{version}.tar.gz
+Name:           osp-connectivity-service
+Version:        1.2.1.0
+Release:        2
+License:        Apache-2.0 or Flora
+Summary:        OSP Connectivity Service
+Group:          Telephony/Libraries
+Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(chromium)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(capi-telephony-sim)
-BuildRequires:  pkgconfig(wifi-direct)
-BuildRequires:  pkgconfig(capi-network-wifi)
-BuildRequires:  pkgconfig(capi-network-nfc)
+BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  osp-bluetooth-internal-devel
+BuildRequires:  osp-net-internal-devel
+BuildRequires:  osp-nfc-internal-devel
+BuildRequires:  osp-telephony-devel
+BuildRequires:  osp-telephony-internal-devel
+BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(capi-network-connection)
-BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(capi-network-nfc)
+BuildRequires:  pkgconfig(capi-network-wifi)
 BuildRequires:  pkgconfig(capi-system-device)
+BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(capi-telephony-sim)
+BuildRequires:  pkgconfig(chromium)
+BuildRequires:  pkgconfig(ecore)
+BuildRequires:  pkgconfig(evas)
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(osp-appfw)
-BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  pkgconfig(osp-bluetooth)
 BuildRequires:  pkgconfig(osp-net)
-BuildRequires:  osp-net-internal-devel
 BuildRequires:  pkgconfig(osp-nfc)
-BuildRequires:  osp-nfc-internal-devel
-BuildRequires:  pkgconfig(osp-bluetooth)
-BuildRequires:  osp-bluetooth-internal-devel
 BuildRequires:  pkgconfig(osp-telephony)
-BuildRequires:  osp-telephony-devel
-BuildRequires:  osp-telephony-internal-devel
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(pkgmgr)
-BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(capi-appfw-app-manager)
+BuildRequires:  pkgconfig(tapi)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(wifi-direct)
 
+Requires:       osp-app-service
 # runtime requires
-Requires: osp-appfw 
-Requires: osp-installer 
-Requires: osp-app-service
-Requires: osp-channel-service
+Requires:       osp-appfw
+Requires:       osp-channel-service
+Requires:       osp-installer
 
 %description
-osp connectivity service
+OSP Connectivity Service
 
 %prep
 %setup -q
 
-%build 
+%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}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" %cmake . 
 %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}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" %cmake . 
 %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.Flora  %{buildroot}/usr/share/license/%{name}
-cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0 >> %{buildroot}/usr/share/license/%{name}
-
 %make_install
 
 %post
@@ -72,9 +67,10 @@ mkdir -p /opt/usr/share/nfcpush
 
 /usr/etc/package-manager/backend/tpk -i /usr/apps/57r43275q7
 
-#%postun -p /sbin/ldconfig
 
 %files
 %manifest osp-connectivity-service.manifest
-/usr/share/license/%{name}
-/usr/apps/*
+%license LICENSE.APLv2.0  LICENSE.Flora
+%{_prefix}/apps/57r43275q7/bin/osp-connectivity-service.exe
+%{_prefix}/apps/57r43275q7/data/.readme
+%{_prefix}/apps/57r43275q7/info/manifest.xml