packages: evas/evas.spec - patch for new automake - xcb bcond switched (doe...

[zbyniu]

Author: zbyniu                       Date: Sat Jan 21 19:35:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch for new automake
- xcb bcond switched (doesn't work), must be consistent with ecore.spec bcond
- rel 3

---- Files affected:
packages/evas:
   evas.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: packages/evas/evas.spec
diff -u packages/evas/evas.spec:1.77 packages/evas/evas.spec:1.78
--- packages/evas/evas.spec:1.77	Fri Jan 13 15:48:26 2012
+++ packages/evas/evas.spec	Sat Jan 21 20:35:53 2012
@@ -7,7 +7,7 @@
 %bcond_without	fb		# FB engine
 %bcond_without	directfb	# DirectFB engine
 %bcond_without	sdl		# SDL (OpenGL and software) engines
-%bcond_without	xcb		# software_x11 engine with XCB support
+%bcond_with	xcb		# software_x11 engine with XCB support (experimental)
 %bcond_without	static_libs	# don't build static library
 #
 %ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
@@ -27,12 +27,13 @@
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
 Version:	1.1.0
-Release:	2
+Release:	3
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
 # Source0-md5:	f8d8751be7cfc8124e5af31e2dced792
 Patch0:		%{name}-harfbuzz.patch
+Patch1:		automake.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	Mesa-libGLU-devel
@@ -399,6 +400,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -418,7 +420,6 @@
 	--enable-fb%{!?with_fb:=no} \
 	--enable-font-loader-eet	\
 	--enable-gl-sdl%{!?with_sdl:=no} \
-	--enable-gl-x11 \
 	--enable-image-loader-edb	\
 	--enable-image-loader-eet	\
 	--enable-image-loader-gif	\
@@ -430,9 +431,12 @@
 	--enable-pixman			\
 	--enable-software-sdl%{!?with_sdl:=no} \
 	--enable-software-xcb%{!?with_xcb:=no} \
+	--enable-software-xlib \
+	--enable-gl-xcb%{!?with_xcb:=no} \
+	--enable-gl-xlib \
 	--disable-valgrind
 
-%{__make}
+%{__make} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -660,6 +664,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2012/01/21 19:35:53  zbyniu
+- patch for new automake
+- xcb bcond switched (doesn't work), must be consistent with ecore.spec bcond
+- rel 3
+
 Revision 1.77  2012/01/13 14:48:26  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evas/evas.spec?r1=1.77&r2=1.78&f=u