From 730e4f20d8e92959b85fb04460d36f11f009d215 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Fri, 13 Jan 2017 14:51:15 +0900 Subject: [PATCH] Prepare for Tizen 4.0 Build I've assumed that Tizen 4.0 code is going to be more similar with 3.0 than 2.0. Please do not rely on string == compare for version check. Change-Id: I968287f7e96526a6d9e2155934d79755fa8a9cf1 Signed-off-by: MyungJoo Ham --- packaging/fido-client.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packaging/fido-client.spec b/packaging/fido-client.spec index 1b573e8..b145291 100644 --- a/packaging/fido-client.spec +++ b/packaging/fido-client.spec @@ -8,7 +8,7 @@ License: Apache-2.0 Source0: fido-client-%{version}.tar.gz Source1: org.tizen.fido.service Source2: org.tizen.fido.conf -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 Source3: fido.service %else Source3: org.tizen.fido.service @@ -24,7 +24,7 @@ BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(glib-2.0) >= 2.26 BuildRequires: pkgconfig(gio-unix-2.0) -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-session) @@ -60,7 +60,7 @@ Requires: %{name} = %{version}-%{release} %description devel Development files for %{name} -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 %define _pkg_dir %{TZ_SYS_RO_APP}/org.tizen.fidosvcui %define _bin_dir %{_pkg_dir}/bin %define _lib_dir %{_pkg_dir}/lib @@ -82,13 +82,13 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden" -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 _JSON_BUILDER="YES" %else _JSON_BUILDER="NO" %endif -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 cmake . \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIBDIR=%{_libdir} \ @@ -110,7 +110,7 @@ cmake . \ make %{?_smp_mflags} -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 %install rm -rf %{buildroot} @@ -165,13 +165,13 @@ chsmack -a '_' %{_libdir}/fido/asm/ %{_libdir}/*.so.* %manifest fido.manifest -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 %config %{_sysconfdir}/dbus-1/system.d/org.tizen.fido.conf %endif %{_bindir}/fido-service -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 %attr(0644,root,root) /usr/share/dbus-1/system-services/org.tizen.fido.service %else @@ -206,7 +206,7 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(glib-2.0) >= 2.26 BuildRequires: pkgconfig(gio-unix-2.0) -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 BuildRequires: pkgconfig(libtzplatform-config) %endif @@ -218,7 +218,7 @@ FIDO Service UI provides Authenticator selection UI. %files -n org.tizen.fidosvcui %defattr(-,root,root,-) -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 %manifest org.tizen.fidosvcui.manifest %{TZ_SYS_RO_APP}/org.tizen.fidosvcui/bin/* %{TZ_SYS_RO_PACKAGES}/org.tizen.fidosvcui.xml @@ -248,7 +248,7 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(glib-2.0) >= 2.26 BuildRequires: pkgconfig(gio-unix-2.0) -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 BuildRequires: pkgconfig(libtzplatform-config) %endif @@ -260,7 +260,7 @@ This is a dummy ASM for testing FIDO client. %files -n dummyasm %manifest dummyasm.manifest -%if "%{?tizen_version}" == "3.0" +%if 0%{?tizen_version_major} >= 3 %config %{_sysconfdir}/dbus-1/system.d/org.tizen.dummyasm.conf %{_bindir}/dummyasm-service %attr(0644,root,root) /usr/share/dbus-1/system-services/org.tizen.dummyasm.service -- 2.7.4