From: wangfei <feix.w.wang@intel.com>
Date: Fri, 13 Dec 2013 08:43:10 +0000 (+0800)
Subject: change {without x} to {with x}
X-Git-Tag: accepted/tizen/generic/20140106.135303^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F13743%2F1;p=platform%2Fupstream%2Fgiflib.git

change {without x} to {with x}

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
---

diff --git a/packaging/giflib.spec b/packaging/giflib.spec
index 9034c8e..dc8d42b 100644
--- a/packaging/giflib.spec
+++ b/packaging/giflib.spec
@@ -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