From 912b9d68f401ba80d0e16be03b43fdf3abf1a16c Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 30 Aug 2013 15:25:55 -0400 Subject: [PATCH] cleanup packaging - Set license correctly - Fixed package groups - Use %license macro - Do not hardcode optimization flags - Remove executable flag from build files and licenses Signed-off-by: Anas Nashif --- CMakeLists.txt | 0 LICENSE.Flora | 0 packaging/osp-uifw.spec | 108 ++++++++++++++++++++++-------------------------- 3 files changed, 49 insertions(+), 59 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 LICENSE.Flora diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/LICENSE.Flora b/LICENSE.Flora old mode 100755 new mode 100644 diff --git a/packaging/osp-uifw.spec b/packaging/osp-uifw.spec index bd58eac..880b45a 100755 --- a/packaging/osp-uifw.spec +++ b/packaging/osp-uifw.spec @@ -1,85 +1,79 @@ -Name: osp-uifw -Summary: The UI Framework library of OSP -Version: 1.2.1.0 -Release: 60 -Group: TO_BE/FILLED_IN -License: TO BE FILLED IN -Source0: %{name}-%{version}.tar.gz +Name: osp-uifw +Version: 1.2.1.0 +Release: 60 +License: Apache-2.0 or Flora +Summary: The UI Framework library of OSP +Group: Graphics & UI Framework/Libraries +Source0: %{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: pkgconfig(capi-appfw-application) -BuildRequires: pkgconfig(capi-system-info) -BuildRequires: pkgconfig(capi-system-device) -BuildRequires: pkgconfig(capi-system-runtime-info) -BuildRequires: pkgconfig(bundle) +BuildRequires: liblua-devel +BuildRequires: osp-appfw-internal-devel +BuildRequires: osp-image-core-internal-devel +BuildRequires: tolua++-devel BuildRequires: pkgconfig(appcore-common) BuildRequires: pkgconfig(appcore-efl) -BuildRequires: pkgconfig(sensor) BuildRequires: pkgconfig(appsvc) +BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(capi-system-device) +BuildRequires: pkgconfig(capi-system-info) +BuildRequires: pkgconfig(capi-system-runtime-info) BuildRequires: pkgconfig(chromium) -BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(edbus) BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(evas) -BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(ethumb) +BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(ewebkit2) -BuildRequires: pkgconfig(xdamage) -BuildRequires: pkgconfig(gles20) -BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(feedback) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(gles20) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libdri2) BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libtbm) +BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtbm) +BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libwbxml2) BuildRequires: pkgconfig(osp-appfw) -BuildRequires: osp-appfw-internal-devel BuildRequires: pkgconfig(osp-image-core) -BuildRequires: osp-image-core-internal-devel BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(pkgmgr) +BuildRequires: pkgconfig(sensor) BuildRequires: pkgconfig(tts) -BuildRequires: pkgconfig(utilX) +BuildRequires: pkgconfig(utilX) +BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xtst) -BuildRequires: libexif-devel -BuildRequires: liblua-devel -BuildRequires: libtiff-devel -BuildRequires: tolua++-devel -BuildRequires: pkgconfig(feedback) +BuildRequires: pkgconfig(xv) # runtime requires -Requires: capi-appfw-application -Requires: capi-system-info -Requires: osp-appfw -Requires: osp-image-core -Provides: libosp-uifw.so.1 - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +Requires: capi-appfw-application +Requires: capi-system-info +Requires: osp-appfw +Requires: osp-image-core %description The UI Framework library of OSP %package devel -Summary: The UI Framework library of OSP (Development) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Summary: The UI Framework library of OSP (Development) +Requires: %{name} = %{version} %description devel The UI Framework library of OSP (DEV) %package internal-devel -Summary: osp ui framework internel (Internal) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} +Summary: OSP ui framework internel (Internal) +Requires: %{name} = %{version} %description internal-devel The UI Framework library of OSP (Internal-DEV) @@ -90,38 +84,34 @@ The UI Framework library of OSP (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} -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="$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} -cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license/%{name} %make_install mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants install -m 0644 clipboard.service %{buildroot}%{_prefix}/lib/systemd/system/clipboard.service ln -s ../clipboard.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/clipboard.service + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -/usr/lib/systemd/system/clipboard.service -/usr/lib/systemd/system/multi-user.target.wants/clipboard.service %manifest osp-uifw.manifest -/etc/config/screen/sysinfo-screen.xml -/etc/config/touch/sysinfo-touch.xml -/usr/share/license/%{name} -/usr/share/osp/bitmaps/* -/usr/share/osp/themes/* -/usr/share/osp/effects/* +%license LICENSE.APLv2 LICENSE.Flora +%{_prefix}/lib/systemd/system/clipboard.service +%{_prefix}/lib/systemd/system/multi-user.target.wants/clipboard.service +%{_sysconfdir}/config/screen/sysinfo-screen.xml +%{_sysconfdir}/config/touch/sysinfo-touch.xml +%{_datadir}/osp/bitmaps/* +%{_datadir}/osp/themes/* +%{_datadir}/osp/effects/* %{_libdir}/osp/libosp-uifw.so* %files devel -- 2.7.4