From: Anas Nashif Date: Mon, 16 Sep 2013 21:41:07 +0000 (-0400) Subject: cleanup packaging X-Git-Tag: accepted/tizen/20130927.081017~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62f6c34477bf5c84e5275f04232711adad2fd6cc;p=platform%2Fframework%2Fnative%2Fappfw.git cleanup packaging - Do not hardcode cflags - Use find_lang macro to install locale files - Use %license macro Change-Id: I478362ff30ea7df3a0b651f342033990a6b9f578 Signed-off-by: Anas Nashif --- diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec index b604a2e..8c3c9a5 100644 --- a/packaging/osp-appfw.spec +++ b/packaging/osp-appfw.spec @@ -1,98 +1,96 @@ -Name: osp-appfw -Summary: The App Framework library of OSP -Version: 1.2.2.1 -Release: 1 -Group: Application Framework/Libraries -License: Apache-2.0 or Flora -Source0: %{name}-%{version}.tar.gz -Source1001: osp-appfw.manifest -URL: https://review.tizen.org/git/?p=platform/framework/native/appfw.git;a=summary -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) -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-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) -BuildRequires: pkgconfig(appsvc) -BuildRequires: pkgconfig(aul) -BuildRequires: pkgconfig(bundle) -BuildRequires: pkgconfig(chromium) -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(devman) -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) -BuildRequires: pkgconfig(edje) -BuildRequires: pkgconfig(eet) -BuildRequires: pkgconfig(edbus) -BuildRequires: pkgconfig(efreet) -BuildRequires: pkgconfig(ethumb) -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(iniparser) -BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libssl) -BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(message-port) -BuildRequires: pkgconfig(minizip) -BuildRequires: pkgconfig(notification) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(pkgmgr) -BuildRequires: pkgconfig(pkgmgr-info) -BuildRequires: pkgconfig(pmapi) -BuildRequires: pkgconfig(libprivilege-control) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(uuid) -BuildRequires: pkgconfig(vconf) -BuildRequires: pkgconfig(zlib) -BuildRequires: pkgconfig(haptic) -BuildRequires: pkgconfig(x11) -BuildRequires: privacy-manager-client-devel -BuildRequires: capi-security-privilege-manager-devel -BuildRequires: boost-devel -BuildRequires: gettext-tools -BuildRequires: pkgconfig(security-server) -BuildRequires: pkgconfig(badge) -BuildRequires: pkgconfig(appinfo) >= 0.1.0 +Name: osp-appfw +Version: 1.2.2.1 +Release: 1 +License: Apache-2.0 or Flora +Summary: The App Framework library of OSP +Url: https://review.tizen.org/git/?p=platform/framework/native/appfw.git;a=summary +Group: Application Framework/Libraries +Source0: %{name}-%{version}.tar.gz +Source1001: osp-appfw.manifest +BuildRequires: boost-devel +BuildRequires: capi-security-privilege-manager-devel +BuildRequires: cmake +BuildRequires: gettext-tools +BuildRequires: privacy-manager-client-devel +BuildRequires: pkgconfig(alarm-service) +BuildRequires: pkgconfig(appinfo) >= 0.1.0 +BuildRequires: pkgconfig(appsvc) +BuildRequires: pkgconfig(aul) +BuildRequires: pkgconfig(badge) +BuildRequires: pkgconfig(bundle) +BuildRequires: pkgconfig(capi-appfw-app-manager) +BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(capi-appfw-package-manager) +BuildRequires: pkgconfig(capi-content-mime-type) +BuildRequires: pkgconfig(capi-media-sound-manager) +BuildRequires: pkgconfig(capi-network-bluetooth) +BuildRequires: pkgconfig(capi-network-serial) +BuildRequires: pkgconfig(capi-network-tethering) +BuildRequires: pkgconfig(capi-network-wifi) +BuildRequires: pkgconfig(capi-network-wifi-direct) +BuildRequires: pkgconfig(capi-system-device) +BuildRequires: pkgconfig(capi-system-info) +BuildRequires: pkgconfig(capi-system-media-key) +BuildRequires: pkgconfig(capi-system-power) +BuildRequires: pkgconfig(capi-system-runtime-info) +BuildRequires: pkgconfig(capi-system-system-settings) +BuildRequires: pkgconfig(capi-telephony-sim) +BuildRequires: pkgconfig(chromium) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(devman) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(dukgenerator) +BuildRequires: pkgconfig(ecore) +BuildRequires: pkgconfig(edbus) +BuildRequires: pkgconfig(edje) +BuildRequires: pkgconfig(eet) +BuildRequires: pkgconfig(efreet) +BuildRequires: pkgconfig(eina) +BuildRequires: pkgconfig(elementary) +BuildRequires: pkgconfig(ethumb) +BuildRequires: pkgconfig(evas) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(haptic) +BuildRequires: pkgconfig(heynoti) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(iniparser) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libprivilege-control) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(message-port) +BuildRequires: pkgconfig(minizip) +BuildRequires: pkgconfig(notification) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(pkgmgr) +BuildRequires: pkgconfig(pkgmgr-info) +BuildRequires: pkgconfig(pmapi) +BuildRequires: pkgconfig(security-server) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(sysman) +BuildRequires: pkgconfig(tapi) +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(wifi-direct) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(zlib) # runtime requires -Requires: capi-appfw-app-manager -Requires: capi-appfw-application -Requires: capi-appfw-package-manager -Requires: capi-content-mime-type -Requires: capi-network-serial -Requires: capi-system-runtime-info -Requires: capi-security-privilege-manager -Requires: chromium -Requires: message-port -Requires: osp-env-config >= 1.2.2.1 -Requires: sqlite - -Provides: libosp-appfw.so.1, libosp-newlib.so.1 - -Requires(post): /sbin/ldconfig +Requires: capi-appfw-app-manager +Requires: capi-appfw-application +Requires: capi-appfw-package-manager +Requires: capi-content-mime-type +Requires: capi-network-serial +Requires: capi-security-privilege-manager +Requires: capi-system-runtime-info +Requires: chromium +Requires: message-port +Requires: osp-env-config >= 1.2.2.1 +Requires: sqlite + +Requires(post): /sbin/ldconfig Requires(post): coreutils Requires(postun): /sbin/ldconfig @@ -100,21 +98,19 @@ Requires(postun): /sbin/ldconfig The App Framework library of OSP %package devel -Summary: The App Framework library of OSP (Development) -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: boost-devel -Requires: pkgconfig(pkgmgr-info) -Requires: pkgconfig(capi-appfw-app-manager) +Summary: The App Framework library of OSP (Development) +Requires: %{name} = %{version} +Requires: boost-devel +Requires: pkgconfig(capi-appfw-app-manager) +Requires: pkgconfig(pkgmgr-info) %description devel The App Framework library of OSP (DEV) %package internal-devel -Summary: OSP app framework internel (Internal) -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig(capi-appfw-app-manager) +Summary: OSP app framework internel (Internal) +Requires: %{name} = %{version} +Requires: pkgconfig(capi-appfw-app-manager) %description internal-devel The App Framework library of OSP (Internal-DEV) @@ -127,28 +123,20 @@ cp %{SOURCE1001} . MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} %if 0%{?simulator} -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="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86 +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ " %cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86 %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 +CXXFLAGS="$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} -%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} - %make_install +%find_lang osp %post /sbin/ldconfig @@ -172,15 +160,16 @@ chown -R 5000:5000 /opt/usr/media locale -a > /opt/usr/etc/clocale.list chmod 444 /opt/usr/etc/clocale.list + %postun -p /sbin/ldconfig -%files +%files -f osp.lang + %manifest %{name}.manifest -/usr/share/license/%{name} -%config /etc/* +%license LICENSE.APLv2 LICENSE.Flora +%config %{_sysconfdir}/* %config /opt/usr/etc/* -/usr/share/locale/* -%config /usr/etc/* +%config %{_prefix}/etc/* %{_libdir}/osp/libosp-appfw.so* %{_libdir}/osp/libosp-newlib.so* %{_libdir}/osp-server/libosp-appfw-server.so*