X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fosp-appfw.spec;h=255266f8c1dd5dd57761bb38552fef44243875ba;hb=89cadcf7665edb2d2bcf3d683308f6101b97044a;hp=9f35ebde708801e4f2ac7959ca955adf8facfbb1;hpb=60926fe51235e3d27389e48d62d47b826b0e0602;p=platform%2Fframework%2Fnative%2Fappfw.git

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
old mode 100755
new mode 100644
index 9f35ebd..255266f
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -2,16 +2,14 @@
 %define __strip /bin/true
 
 Name:       osp-appfw
-Summary:    The App Framework library of OSP 
-Version:    1.2.2.0
+Summary:    The App Framework library of OSP
+Version:    1.2.2.1
 Release:    1
 Group:      TO_BE/FILLED_IN
-License:    Apache License, Version 2.0 or Flora
+License:    Apache-2.0 or Flora
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(capi-appfw-app-manager)
-BuildRequires:  pkgconfig(capi-appfw-package-manager)
 BuildRequires:  pkgconfig(capi-content-mime-type)
 BuildRequires:  pkgconfig(capi-network-serial)
 BuildRequires:  pkgconfig(capi-system-device)
@@ -19,13 +17,14 @@ BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-system-power)
 BuildRequires:  pkgconfig(capi-system-runtime-info)
 BuildRequires:  pkgconfig(capi-system-system-settings)
-BuildRequires:  pkgconfig(capi-system-media-key)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:	pkgconfig(capi-telephony-sim)
 BuildRequires:	pkgconfig(capi-network-tethering)
 BuildRequires:	pkgconfig(capi-network-wifi)
 BuildRequires:	pkgconfig(capi-network-wifi-direct)
+BuildRequires:	pkgconfig(wifi-direct)
 BuildRequires:	pkgconfig(capi-media-sound-manager)
+BuildRequires:  pkgconfig(capi-system-media-key)
 BuildRequires:	pkgconfig(sysman)
 BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(alarm-service)
@@ -40,7 +39,6 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dukgenerator)
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(heynoti)
 BuildRequires:	pkgconfig(elementary)
 BuildRequires:	pkgconfig(eina)
 BuildRequires:	pkgconfig(evas)
@@ -50,11 +48,11 @@ BuildRequires:	pkgconfig(edbus)
 BuildRequires:	pkgconfig(efreet)
 BuildRequires:	pkgconfig(ethumb)
 BuildRequires:  pkgconfig(icu-i18n)
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libssl)
 BuildRequires:  pkgconfig(libsoup-2.4)
-BuildRequires:  pkgconfig(libwbxml2)
+BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(message-port)
 BuildRequires:  pkgconfig(minizip)
 BuildRequires:  pkgconfig(notification)
@@ -74,10 +72,10 @@ BuildRequires:  capi-security-privilege-manager-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(security-server)
+BuildRequires:  pkgconfig(appinfo) >= 0.1.2
 
 # runtime requires
-Requires: capi-appfw-app-manager  
-Requires: capi-appfw-application  
+Requires: capi-appfw-application
 Requires: capi-appfw-package-manager
 Requires: capi-content-mime-type
 Requires: capi-network-serial
@@ -87,10 +85,11 @@ Requires: chromium
 Requires: message-port
 Requires: osp-env-config
 Requires: sqlite
+Requires: iniparser
 
 Provides:   libosp-appfw.so.1
 
-Requires(post): /sbin/ldconfig  
+Requires(post): /sbin/ldconfig
 Requires(post): coreutils
 Requires(postun): /sbin/ldconfig
 
@@ -99,27 +98,23 @@ The App Framework library of OSP
 
 %package devel
 Summary:    The App Framework library of OSP (Development)
-Group:      TO_BE/FILLED_IN
 Requires:   %{name} = %{version}-%{release}
 Requires: boost-devel
 Requires: pkgconfig(pkgmgr-info)
-Requires: pkgconfig(capi-appfw-app-manager)
 
 %description devel
 The  App Framework library of OSP (DEV)
 
 %package internal-devel
-Summary:    osp app framework internel (Internal)
-Group:      TO_BE/FILLED_IN
+Summary:    OSP app framework internal (Internal)
 Requires:   %{name} = %{version}-%{release}
-Requires: pkgconfig(capi-appfw-app-manager)
+Requires:   %{name}-devel
 
 %description internal-devel
 The App Framework library of OSP (Internal-DEV)
 
 %package debug
 Summary:    The App Framework library of OSP (Development)
-Group:      TO_BE/FILLED_IN
 Requires:   %{name} = %{version}-%{release}
 
 %description debug
@@ -130,20 +125,35 @@ The App Framework library of OSP (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} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
+	ARCH=x86
+	CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_"
+	%if 0%{?simulator}
+		CXXFLAGS="$CXXFLAGS -D_OSP_EMUL_"
+	%endif
 %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
+	ARCH=arm
+	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_OSP_ARMEL_"
+%endif
+
+%if 0%{?tizen_build_binary_release_type_eng}
+	CXXFLAGS="$CXXFLAGS -D_SECURE_LOG"
 %endif
 
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=${ARCH}
+
 # Call make instruction with smp support
-make %{?jobs:-j%jobs}
+#make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
-%install
+%clean
 rm -rf %{buildroot}
+
+%install
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{name}-%{version}/LICENSE.Flora  %{buildroot}/usr/share/license/%{name}
-cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
+cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/license/%{name}
 
 %make_install
 
@@ -176,12 +186,11 @@ chmod 444 /opt/usr/etc/clocale.list
 %files
 %manifest osp-appfw.manifest
 /usr/share/license/%{name}
-/etc/*
-/opt/usr/share/.osp-compat/share/*
-/opt/usr/etc/*
-/usr/share/osp/.*
+%config /etc/*
+%config /opt/usr/etc/*
 /usr/share/locale/*
-/usr/etc/*
+%config /usr/etc/*
+%attr(755,root,app_logging) /usr/bin/nativeinfologctrl
 %{_libdir}/osp/libosp-appfw.so*
 %{_libdir}/osp-server/libosp-appfw-server.so*
 %{_libdir}/osp-server/libosp-system-server.so*
@@ -189,7 +198,6 @@ chmod 444 /opt/usr/etc/clocale.list
 %files devel
 %{_includedir}/osp/*.h
 %{_includedir}/osp/*.hpp
-%{_libdir}/pkgconfig/osp-appfw.pc
 
 %files internal-devel
 %{_includedir}/osp/app/*
@@ -200,6 +208,7 @@ chmod 444 /opt/usr/etc/clocale.list
 %{_includedir}/osp/system/*
 %{_includedir}/osp/text/*
 %{_includedir}/osp/server/*
+%{_libdir}/pkgconfig/osp-appfw.pc
 %{_libdir}/pkgconfig/osp-appfw-server.pc
 %{_libdir}/pkgconfig/osp-system-server.pc
 
@@ -207,4 +216,3 @@ chmod 444 /opt/usr/etc/clocale.list
 %{_libdir}/osp/debug/libosp-appfw.so*
 %{_libdir}/osp-server/debug/libosp-appfw-server.so*
 %{_libdir}/osp-server/debug/libosp-system-server.so*
-