change {without x} to {with x} 43/13743/1 accepted/tizen/generic accepted/tizen/ivi/stable accepted/tizen/mobile accepted/tizen_3.0.2014.q3_common accepted/tizen_3.0.m14.3_ivi accepted/tizen_generic accepted/tizen_ivi_panda tizen_3.0.2014.q3_common tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common tizen_3.0.m14.2_ivi tizen_3.0.m14.3_ivi tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_3.0_ivi tizen_ivi_panda accepted/tizen/generic/20140106.135303 accepted/tizen/generic/20140114.103621 accepted/tizen/ivi/20131214.022604 accepted/tizen/ivi/20160218.024827 accepted/tizen/ivi/panda/20140403.014603 accepted/tizen/mobile/20131216.220222 accepted/tizen/mobile/20140113.202249 submit/tizen/20131213.100852 submit/tizen/20140113.203359 submit/tizen_common/20151015.190624 submit/tizen_common/20151019.135620 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000005 submit/tizen_ivi_panda/20140403.011958 submit/tizen_mobile/20141120.000000 tizen_3.0.2014.q3_common_release tizen_3.0.m14.2_ivi_release tizen_3.0.m14.3_ivi_release tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release tizen_3.0_ivi_release
authorwangfei <feix.w.wang@intel.com>
Fri, 13 Dec 2013 08:43:10 +0000 (16:43 +0800)
committerwangfei <feix.w.wang@intel.com>
Fri, 13 Dec 2013 08:46:05 +0000 (16:46 +0800)
The display server based on X or Wayland, is now a choice of different profile in Tizen 3.0.
Basically and consistently, two macros were used "with wayland" and "with x".
Below summarize the combination of the macros:

| wayland |  x  | meaning
|---------------------------
|   0     |  1  | pure X11 platform(no wayland)
|   1     |  0  | pure wayland platform (no X11)
|   1     |  1  | wayland but X compatibility
|   0     |  0  | no X and no wayland

This method unifies the meaning and usage. Deploy this method to giflib package.

Signed-off-by: wangfei <feix.w.wang@intel.com>
Change-Id: Ie3ac823d5d70f5d2025149b89f501100b9a8e7e4

packaging/giflib.spec

index 9034c8e..dc8d42b 100644 (file)
@@ -1,5 +1,5 @@
 %bcond_with wayland
-
+%bcond_with x
 Name:           giflib
 Version:        4.1.6
 Release:        9
@@ -9,9 +9,7 @@ Url:            http://sourceforge.net/projects/giflib/
 Group:          System/Libraries
 Source0:        http://downloads.sourceforge.net/giflib/%{name}-%{version}.tar.bz2
 Source1001:    giflib.manifest
-%if %{with wayland}
-
-%else
+%if %{with x}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(ice)
@@ -60,7 +58,7 @@ cp %{SOURCE1001} .
 
 %build
 %configure  \
-%if %{with wayland}
+%if %{with wayland} && !%{with x}
   --disable-x11
 %endif