Merge branch 'devel/x11' into tizen

Change-Id: Ia0352afb8d24323fca5f9c4ead12c905ce9ba9e7

diff --combined packaging/fontsproto.spec
index ba23266,897a069..0f24339
--- 1/packaging/fontsproto.spec
--- 2/packaging/fontsproto.spec
+++ b/packaging/fontsproto.spec
@@@ -1,5 -1,7 +1,7 @@@
+ %bcond_with x
+ 
  Name:           fontsproto
- Version:        2.1.2
+ Version:        2.1.3
  Release:        1
  License:        MIT
  Summary:        X
@@@ -11,6 -13,10 +13,6 @@@ Source1001:  fontsproto.manifes
  BuildRequires:  pkgconfig
  BuildRequires:  pkgconfig(xorg-macros)
  
 -%if !%{with x}
 -ExclusiveArch:
 -%endif
 -
  %description
  %{summary}.
  
@@@ -19,7 -25,7 +21,7 @@@
  cp %{SOURCE1001} .
  
  %build
- %configure --disable-static \
+ %autogen --disable-static \
               --libdir=%{_datadir} \
               --without-xmlto