From 60b45f7146eeace60d883b5cbd012c9576476079 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 27 May 2012 19:18:11 +0000
Subject: [PATCH 01/16] - liblinebreak is included (maybe use system one?)

Changed files:
    evas.spec -> 1.83
---
 evas.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evas.spec b/evas.spec
index 1a9940e..d7fed2e 100644
--- a/evas.spec
+++ b/evas.spec
@@ -1,4 +1,4 @@
-# TODO: liblinebreak?
+# TODO: use system liblinebreak?
 #
 # Conditional build:
 %bcond_without	mmx		# MMX and MMX2 support (on x86)
-- 
2.43.0


From f02c736cf1cfed22f817dec8f7bc6975ffd32682 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 28 May 2012 16:49:35 +0000
Subject: [PATCH 02/16] - added 8-bit engines - completed inter-module
 dependencies

Changed files:
    evas.spec -> 1.84
---
 evas.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/evas.spec b/evas.spec
index d7fed2e..a581552 100644
--- a/evas.spec
+++ b/evas.spec
@@ -8,7 +8,7 @@
 %bcond_without	directfb	# DirectFB engine
 %bcond_without	sdl		# SDL (OpenGL and software) engines
 %bcond_without	wayland		# wayland-egl, wayland-shm engines
-%bcond_with	xcb		# software_x11 engine with XCB support (experimental)
+%bcond_with	xcb		# software*_x11/gl_x11 engines with XCB support (experimental)
 %bcond_without	static_libs	# don't build static library
 #
 %ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
@@ -178,7 +178,7 @@ Moduł silnika renderującego na SDL OpenGL dla Evas.
 Summary:	OpenGL under X11 rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego na OpenGL pod X11 dla Evas
 Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
 
 %description engine-gl_x11
 OpenGL under X11 rendering engine module for Evas.
@@ -186,6 +186,30 @@ OpenGL under X11 rendering engine module for Evas.
 %description engine-gl_x11 -l pl.UTF-8
 Moduł silnika renderującego na OpenGL pod X11 dla Evas.
 
+%package engine-software_8
+Summary:	8-bit software rendering engine module for Evas
+Summary(pl.UTF-8):	Moduł silnika programowego renderującego 8-bitowego dla Evas
+Group:		X11/Libraries
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
+
+%description engine-software_8
+8-bit software rendering engine module for Evas.
+
+%description engine-software_8 -l pl.UTF-8
+Moduł silnika programowego renderującego 8-bitowego dla Evas.
+
+%package engine-software_8_x11
+Summary:	8-bit X11 software rendering engine module for Evas
+Summary(pl.UTF-8):	Moduł silnika programowego renderującego 8-bitowego na X11 dla Evas
+Group:		X11/Libraries
+Requires:	%{name}-engine-software_8 = %{version}-%{release}
+
+%description engine-software_8_x11
+8-bit X11 software rendering engine module for Evas.
+
+%description engine-software_8_x11 -l pl.UTF-8
+Moduł silnika programowego renderującego 8-bitowego na X11 dla Evas.
+
 %package engine-software_16
 Summary:	16-bit software rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika programowego renderującego 16-bitowego dla Evas
@@ -202,7 +226,7 @@ Moduł silnika programowego renderującego 16-bitowego dla Evas.
 Summary:	16-bit SDL software rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika programowego renderującego 16-bitowego na SDL dla Evas
 Group:		X11/Libraries
-Requires:	%{name}-engine-software_generic = %{version}-%{release}
+Requires:	%{name}-engine-software_16 = %{version}-%{release}
 Requires:	SDL >= 1.2.0
 Obsoletes:	evas-engine-software_sdl
 
@@ -216,7 +240,7 @@ Moduł silnika programowego renderującego 16-bitowego na SDL dla Evas.
 Summary:	16-bit X11 software rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika programowego renderującego 16-bitowego na X11 dla Evas
 Group:		X11/Libraries
-Requires:	%{name}-engine-software_generic = %{version}-%{release}
+Requires:	%{name}-engine-software_16 = %{version}-%{release}
 
 %description engine-software_16_x11
 16-bit X11 software rendering engine module for Evas.
@@ -253,7 +277,7 @@ Moduł programowego silnika renderującego X11 dla Evas.
 Summary:	Wayland EGL rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego Wayland EGL dla Evas
 Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
 
 %description engine-wayland_egl
 Wayland EGL rendering engine module for Evas.
@@ -265,7 +289,7 @@ Moduł silnika renderującego Wayland EGL dla Evas.
 Summary:	Wayland SHM rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego Wayland SHM dla Evas
 Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
 
 %description engine-wayland_shm
 Wayland SHM rendering engine module for Evas.
@@ -478,6 +502,7 @@ Moduł zapisywania obrazów TIFF dla Evas.
 	--enable-image-loader-tiff	\
 	--enable-image-loader-xpm	\
 	--enable-pixman			\
+	--enable-software-8-x11 \
 	--enable-software-16-sdl%{!?with_sdl:=no} \
 	--enable-software-16-x11 \
 	--enable-software-xcb%{!?with_xcb:=no} \
@@ -549,6 +574,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/evas-fb.pc
 %{?with_sdl:%{_pkgconfigdir}/evas-opengl-sdl.pc}
 %{_pkgconfigdir}/evas-opengl-x11.pc
+%{_pkgconfigdir}/evas-software-8-x11.pc
 %{_pkgconfigdir}/evas-software-16-x11.pc
 %{_pkgconfigdir}/evas-software-buffer.pc
 %{?with_sdl:%{_pkgconfigdir}/evas-software-sdl.pc}
@@ -601,6 +627,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*/module.so
 
+%files engine-software_8
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/modules/engines/software_8
+%dir %{_libdir}/%{name}/modules/engines/software_8/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_8/linux-gnu-*/module.so
+
+%files engine-software_8_x11
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/modules/engines/software_8_x11
+%dir %{_libdir}/%{name}/modules/engines/software_8_x11/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_8_x11/linux-gnu-*/module.so
+
 %files engine-software_16
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/software_16
-- 
2.43.0


From bb0f7edb494317062e1225cc7e69f2356fd9069a Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 28 May 2012 17:31:30 +0000
Subject: [PATCH 03/16] - split xcb_api bcond from xcb (the latter is on by
 default, just controls xcb deps use) - build software_8_x11 engine whenever
 xcb is allowed, but use XCB for gl_x11/software_x11   only if xcb_api is
 chosen - tag gl_x11/software_x11 engines and -devel package with xapi version
 (xcb/xlib)

Changed files:
    evas.spec -> 1.85
---
 evas.spec | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/evas.spec b/evas.spec
index a581552..c5d8701 100644
--- a/evas.spec
+++ b/evas.spec
@@ -8,7 +8,8 @@
 %bcond_without	directfb	# DirectFB engine
 %bcond_without	sdl		# SDL (OpenGL and software) engines
 %bcond_without	wayland		# wayland-egl, wayland-shm engines
-%bcond_with	xcb		# software*_x11/gl_x11 engines with XCB support (experimental)
+%bcond_without	xcb		# XCB engines (software_8_x11, possibly software_x11/gl_x11)
+%bcond_with	xcb_api		# software_x11/gl_x11 engines with XCB support (experimental)
 %bcond_without	static_libs	# don't build static library
 #
 %ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
@@ -20,6 +21,14 @@
 %ifnarch ppc
 %undefine	with_altivec
 %endif
+%if %{without xcb}
+%undefine	xcb_api
+%endif
+%if %{with xcb_api}
+%define		xapi	xcb
+%else
+%define		xapi	xlib
+%endif
 #
 %define		edb_ver		1.0.5.043
 %define		eet_ver 	1.6.0
@@ -103,6 +112,7 @@ Requires:	fontconfig-devel >= 2.5.0
 Requires:	freetype-devel >= 1:2.2
 Requires:	fribidi-devel >= 0.19.2
 Requires:	harfbuzz-devel >= 0.6.0
+Provides:	%{name}-devel(%{xapi}) = %{version}-%{release}
 
 %description devel
 Header files for Evas.
@@ -179,6 +189,7 @@ Summary:	OpenGL under X11 rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego na OpenGL pod X11 dla Evas
 Group:		X11/Libraries
 Requires:	%{name}-engine-software_generic = %{version}-%{release}
+Provides:	%{name}-engine-gl_x11(%{xapi}) = %{version}-%{release}
 
 %description engine-gl_x11
 OpenGL under X11 rendering engine module for Evas.
@@ -205,10 +216,11 @@ Group:		X11/Libraries
 Requires:	%{name}-engine-software_8 = %{version}-%{release}
 
 %description engine-software_8_x11
-8-bit X11 software rendering engine module for Evas.
+8-bit X11 (XCB) software rendering engine module for Evas.
 
 %description engine-software_8_x11 -l pl.UTF-8
-Moduł silnika programowego renderującego 8-bitowego na X11 dla Evas.
+Moduł silnika programowego renderującego 8-bitowego na X11 (XCB) dla
+Evas.
 
 %package engine-software_16
 Summary:	16-bit software rendering engine module for Evas
@@ -243,10 +255,11 @@ Group:		X11/Libraries
 Requires:	%{name}-engine-software_16 = %{version}-%{release}
 
 %description engine-software_16_x11
-16-bit X11 software rendering engine module for Evas.
+16-bit X11 (Xlib) software rendering engine module for Evas.
 
 %description engine-software_16_x11 -l pl.UTF-8
-Moduł silnika programowego renderującego 16-bitowego na X11 dla Evas.
+Moduł silnika programowego renderującego 16-bitowego na X11 (Xlib) dla
+Evas.
 
 %package engine-software_generic
 Summary:		Software rendering common engine module for Evas
@@ -491,7 +504,7 @@ Moduł zapisywania obrazów TIFF dla Evas.
 	--enable-fb%{!?with_fb:=no} \
 	--enable-font-loader-eet	\
 	--enable-gl-sdl%{!?with_sdl:=no} \
-	--enable-gl-xcb%{!?with_xcb:=no} \
+	--enable-gl-xcb%{!?with_xcb_api:=no} \
 	--enable-gl-xlib \
 	--enable-image-loader-edb	\
 	--enable-image-loader-eet	\
@@ -502,10 +515,10 @@ Moduł zapisywania obrazów TIFF dla Evas.
 	--enable-image-loader-tiff	\
 	--enable-image-loader-xpm	\
 	--enable-pixman			\
-	--enable-software-8-x11 \
+	--enable-software-8-x11%{!?with_xcb:=no} \
 	--enable-software-16-sdl%{!?with_sdl:=no} \
 	--enable-software-16-x11 \
-	--enable-software-xcb%{!?with_xcb:=no} \
+	--enable-software-xcb%{!?with_xcb_api:=no} \
 	--enable-software-xlib \
 	--enable-wayland-egl%{!?with_wayland:=no} \
 	--enable-wayland-shm%{!?with_wayland:=no} \
@@ -574,7 +587,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/evas-fb.pc
 %{?with_sdl:%{_pkgconfigdir}/evas-opengl-sdl.pc}
 %{_pkgconfigdir}/evas-opengl-x11.pc
-%{_pkgconfigdir}/evas-software-8-x11.pc
+%{?with_xcb:%{_pkgconfigdir}/evas-software-8-x11.pc}
 %{_pkgconfigdir}/evas-software-16-x11.pc
 %{_pkgconfigdir}/evas-software-buffer.pc
 %{?with_sdl:%{_pkgconfigdir}/evas-software-sdl.pc}
@@ -627,6 +640,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*/module.so
 
+%if %{with xcb}
 %files engine-software_8
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/software_8
@@ -638,6 +652,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/software_8_x11
 %dir %{_libdir}/%{name}/modules/engines/software_8_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_8_x11/linux-gnu-*/module.so
+%endif
 
 %files engine-software_16
 %defattr(644,root,root,755)
-- 
2.43.0


From 043be4ebd7930113ce8c34410d261f7b59c7cccf Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 16 Jun 2012 19:45:32 +0000
Subject: [PATCH 04/16] - updated to 1.2.1

Changed files:
    evas.spec -> 1.86
---
 evas.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evas.spec b/evas.spec
index c5d8701..734a522 100644
--- a/evas.spec
+++ b/evas.spec
@@ -36,12 +36,12 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.2.0
+Version:	1.2.1
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	a245e432695cea1120d43cdbcb94b7f7
+# Source0-md5:	0b8dd697b76dcc5511c463f314719899
 Patch0:		%{name}-harfbuzz.patch
 Patch1:		%{name}-wayland.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
-- 
2.43.0


From 9f72d789695da9d06e9a5c984429ab2cda5389fb Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 3 Sep 2012 21:19:33 +0200
Subject: [PATCH 05/16] - updated to 1.7.0 - removed outdated harfbuzz patch
 (evas now needs recently released harfbuzz 0.9.0) - librsvg-based loader has
 been replaced by esvg-based one; esvg is not released yet, so disabled it

---
 evas-harfbuzz.patch | 15 ---------
 evas.spec           | 78 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 61 insertions(+), 32 deletions(-)
 delete mode 100644 evas-harfbuzz.patch

diff --git a/evas-harfbuzz.patch b/evas-harfbuzz.patch
deleted file mode 100644
index 002f3dd..0000000
--- a/evas-harfbuzz.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- evas-1.1.0/src/lib/engines/common/evas_font_ot.c.orig	2011-10-18 15:17:19.000000000 +0200
-+++ evas-1.1.0/src/lib/engines/common/evas_font_ot.c	2011-12-11 14:07:19.125506961 +0100
-@@ -286,10 +286,10 @@
-         slen = len;
-      }
- 
--   buffer = hb_buffer_create();
-+   buffer = hb_buffer_create(0);
-    hb_buffer_set_unicode_funcs(buffer, _evas_common_font_ot_unicode_funcs_get());
-    hb_buffer_set_language(buffer, hb_language_from_string(
--            evas_common_language_from_locale_get(), -1));
-+            evas_common_language_from_locale_get()));
-    hb_buffer_set_script(buffer, _evas_script_to_harfbuzz[props->script]);
-    hb_buffer_set_direction(buffer,
-          (props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) ?
diff --git a/evas.spec b/evas.spec
index 734a522..84508d8 100644
--- a/evas.spec
+++ b/evas.spec
@@ -7,6 +7,7 @@
 %bcond_without	fb		# FB engine
 %bcond_without	directfb	# DirectFB engine
 %bcond_without	sdl		# SDL (OpenGL and software) engines
+%bcond_with	svg		# Esvg-based SVG loader
 %bcond_without	wayland		# wayland-egl, wayland-shm engines
 %bcond_without	xcb		# XCB engines (software_8_x11, possibly software_x11/gl_x11)
 %bcond_with	xcb_api		# software_x11/gl_x11 engines with XCB support (experimental)
@@ -31,19 +32,18 @@
 %endif
 #
 %define		edb_ver		1.0.5.043
-%define		eet_ver 	1.6.0
+%define		eet_ver 	1.7.0
 
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.2.1
+Version:	1.7.0
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	0b8dd697b76dcc5511c463f314719899
-Patch0:		%{name}-harfbuzz.patch
-Patch1:		%{name}-wayland.patch
+# Source0-md5:	37411199fe3af65884ccacaa21c304bd
+Patch0:		%{name}-wayland.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
 BuildRequires:	Mesa-libGLU-devel
@@ -52,15 +52,15 @@ BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1.6
 BuildRequires:	edb-devel >= %{edb_ver}
 BuildRequires:	eet-devel >= %{eet_ver}
-BuildRequires:	eina-devel >= 1.2.0
+BuildRequires:	eina-devel >= 1.6.0
+%{?with_svg:BuildRequires:	esvg-devel >= 0.0.16}
 BuildRequires:	fontconfig-devel >= 2.5.0
 BuildRequires:	freetype-devel >= 1:2.2
 BuildRequires:	fribidi-devel >= 0.19.2
 BuildRequires:	giflib-devel
-BuildRequires:	harfbuzz-devel >= 0.6.0
+BuildRequires:	harfbuzz-devel >= 0.9.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.2
-BuildRequires:	librsvg-devel >= 1:2.14.0
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
 BuildRequires:	pixman-devel
@@ -79,10 +79,10 @@ BuildRequires:	Mesa-libwayland-egl-devel
 BuildRequires:	wayland-devel
 %endif
 Requires:	eet >= %{eet_ver}
-Requires:	eina >= 1.2.0
+Requires:	eina >= 1.6.0
 Requires:	freetype >= 1:2.2
 Requires:	fribidi >= 0.19.2
-Requires:	harfbuzz >= 0.6.0
+Requires:	harfbuzz >= 0.9.0
 Obsoletes:	evas-libs
 Obsoletes:	evas-engine-software_qtopia
 Obsoletes:	evas-engine-xrender_x11
@@ -107,11 +107,11 @@ Summary(pl.UTF-8):	Pliki nagłówkowe Evas
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	eet-devel >= %{eet_ver}
-Requires:	eina-devel >= 1.2.0
+Requires:	eina-devel >= 1.6.0
 Requires:	fontconfig-devel >= 2.5.0
 Requires:	freetype-devel >= 1:2.2
 Requires:	fribidi-devel >= 0.19.2
-Requires:	harfbuzz-devel >= 0.6.0
+Requires:	harfbuzz-devel >= 0.9.0
 Provides:	%{name}-devel(%{xapi}) = %{version}-%{release}
 
 %description devel
@@ -388,7 +388,7 @@ Summary:	SVG Image loader module for Evas
 Summary(pl.UTF-8):	Moduł wczytywania obrazów SVG dla Evas
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	librsvg >= 1:2.14.0
+Requires:	esvg >= 0.0.16
 
 %description loader-svg
 SVG Image loader module for Evas.
@@ -484,7 +484,6 @@ Moduł zapisywania obrazów TIFF dla Evas.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -511,7 +510,7 @@ Moduł zapisywania obrazów TIFF dla Evas.
 	--enable-image-loader-gif	\
 	--enable-image-loader-jpeg	\
 	--enable-image-loader-png	\
-	--enable-image-loader-svg	\
+	--enable-image-loader-svg%{!?with_svg:=no} \
 	--enable-image-loader-tiff	\
 	--enable-image-loader-xpm	\
 	--enable-pixman			\
@@ -532,6 +531,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/cserve2/*/*/*/module.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*/*/*/module.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/engines/software_16_sdl/linux-gnu-*/module.a
 
@@ -547,11 +547,33 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/evas_cserve
-%attr(755,root,root) %{_bindir}/evas_cserve_tool
+%attr(755,root,root) %{_bindir}/evas_cserve2_client
+%attr(755,root,root) %{_bindir}/evas_cserve2_debug
+%attr(755,root,root) %{_bindir}/evas_cserve2_usage
 %attr(755,root,root) %{_libdir}/libevas.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libevas.so.1
+%attr(755,root,root) %{_libexecdir}/dummy_slave
+%attr(755,root,root) %{_libexecdir}/evas_cserve2
+%attr(755,root,root) %{_libexecdir}/evas_cserve2_slave
 %dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/cserve2
+%dir %{_libdir}/%{name}/cserve2/loaders
+# loaders without additional dependencies
+%dir %{_libdir}/%{name}/cserve2/loaders/bmp
+%dir %{_libdir}/%{name}/cserve2/loaders/bmp/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/bmp/linux-gnu-*/module.so
+%dir %{_libdir}/%{name}/cserve2/loaders/ico
+%dir %{_libdir}/%{name}/cserve2/loaders/ico/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/ico/linux-gnu-*/module.so
+%dir %{_libdir}/%{name}/cserve2/loaders/psd
+%dir %{_libdir}/%{name}/cserve2/loaders/psd/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/psd/linux-gnu-*/module.so
+%dir %{_libdir}/%{name}/cserve2/loaders/tga
+%dir %{_libdir}/%{name}/cserve2/loaders/tga/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/tga/linux-gnu-*/module.so
+%dir %{_libdir}/%{name}/cserve2/loaders/wbmp
+%dir %{_libdir}/%{name}/cserve2/loaders/wbmp/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/wbmp/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules
 %dir %{_libdir}/%{name}/modules/engines
 %dir %{_libdir}/%{name}/modules/loaders
@@ -575,6 +597,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/loaders/wbmp
 %dir %{_libdir}/%{name}/modules/loaders/wbmp/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/wbmp/linux-gnu-*/module.so
+%{_datadir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
@@ -698,6 +721,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/wayland_shm
 %dir %{_libdir}/%{name}/modules/engines/wayland_shm/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/wayland_shm/linux-gnu-*/module.so
+%endif
 
 %files loader-edb
 %defattr(644,root,root,755)
@@ -707,6 +731,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files loader-eet
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/cserve2/loaders/eet
+%dir %{_libdir}/%{name}/cserve2/loaders/eet/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/eet/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules/loaders/eet
 %dir %{_libdir}/%{name}/modules/loaders/eet/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/eet/linux-gnu-*/module.so
@@ -719,36 +746,53 @@ rm -rf $RPM_BUILD_ROOT
 
 %files loader-jpeg
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/cserve2/loaders/jpeg
+%dir %{_libdir}/%{name}/cserve2/loaders/jpeg/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/jpeg/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules/loaders/jpeg
 %dir %{_libdir}/%{name}/modules/loaders/jpeg/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/jpeg/linux-gnu-*/module.so
 
 %files loader-pmaps
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/cserve2/loaders/pmaps
+%dir %{_libdir}/%{name}/cserve2/loaders/pmaps/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/pmaps/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules/loaders/pmaps
 %dir %{_libdir}/%{name}/modules/loaders/pmaps/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/pmaps/linux-gnu-*/module.so
 
 %files loader-png
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/cserve2/loaders/png
+%dir %{_libdir}/%{name}/cserve2/loaders/png/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/png/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules/loaders/png
 %dir %{_libdir}/%{name}/modules/loaders/png/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/png/linux-gnu-*/module.so
 
+%if %{with svg}
 %files loader-svg
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/loaders/svg
 %dir %{_libdir}/%{name}/modules/loaders/svg/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/svg/linux-gnu-*/module.so
+%endif
 
 %files loader-tiff
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/cserve2/loaders/tiff
+%dir %{_libdir}/%{name}/cserve2/loaders/tiff/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/tiff/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules/loaders/tiff
 %dir %{_libdir}/%{name}/modules/loaders/tiff/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/tiff/linux-gnu-*/module.so
 
 %files loader-xpm
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/cserve2/loaders/xpm
+%dir %{_libdir}/%{name}/cserve2/loaders/xpm/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/cserve2/loaders/xpm/linux-gnu-*/module.so
 %dir %{_libdir}/%{name}/modules/loaders/xpm
 %dir %{_libdir}/%{name}/modules/loaders/xpm/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/xpm/linux-gnu-*/module.so
-- 
2.43.0


From 67be827060f0630ed38a8eb4d594aa2dc71adb14 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 6 Oct 2012 20:51:22 +0200
Subject: [PATCH 06/16] - rebuild with DirectFB 1.6.x - release 2 (by relup.sh)

---
 evas.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evas.spec b/evas.spec
index 84508d8..75586d5 100644
--- a/evas.spec
+++ b/evas.spec
@@ -38,7 +38,7 @@ Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
 Version:	1.7.0
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-- 
2.43.0


From e19481b197be1644218099f9d07225da1fbe6ce4 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 3 Nov 2012 17:26:53 +0100
Subject: [PATCH 07/16] - updated to 1.7.1

---
 evas.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evas.spec b/evas.spec
index 75586d5..aabd54c 100644
--- a/evas.spec
+++ b/evas.spec
@@ -37,12 +37,12 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.0
-Release:	2
+Version:	1.7.1
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	37411199fe3af65884ccacaa21c304bd
+# Source0-md5:	e33c1d270b16e45c2337424aa2faaaa0
 Patch0:		%{name}-wayland.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
-- 
2.43.0


From 9a2cf0cd6723881a61b99366222062b596f03669 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 29 Nov 2012 16:05:38 +0100
Subject: [PATCH 08/16] - updated to 1.7.2

---
 evas.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evas.spec b/evas.spec
index aabd54c..cf0071f 100644
--- a/evas.spec
+++ b/evas.spec
@@ -37,12 +37,12 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.1
+Version:	1.7.2
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	e33c1d270b16e45c2337424aa2faaaa0
+# Source0-md5:	bd6be95827e4db5647bd24fba52e5166
 Patch0:		%{name}-wayland.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
-- 
2.43.0


From 28749a7813c8e7f10697940e74dca8e5af26b806 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 16 Dec 2012 15:24:27 +0100
Subject: [PATCH 09/16] - updated to 1.7.3

---
 evas.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evas.spec b/evas.spec
index cf0071f..ab7a46e 100644
--- a/evas.spec
+++ b/evas.spec
@@ -37,12 +37,12 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.2
+Version:	1.7.3
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	bd6be95827e4db5647bd24fba52e5166
+# Source0-md5:	e1b5f90c2c21803242fca8ef655d08bd
 Patch0:		%{name}-wayland.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
-- 
2.43.0


From a30f33d726d25701a7e7d9334a42273789b3709b Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 12 Jan 2013 18:31:07 +0100
Subject: [PATCH 10/16] - updated to 1.7.5

---
 evas.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evas.spec b/evas.spec
index ab7a46e..c5b6ae5 100644
--- a/evas.spec
+++ b/evas.spec
@@ -37,12 +37,12 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.3
+Version:	1.7.5
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	e1b5f90c2c21803242fca8ef655d08bd
+# Source0-md5:	2c965b836128a839292161d4ca89380d
 Patch0:		%{name}-wayland.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
-- 
2.43.0


From 599b9aa6081dd77e643791ec5fc802002d487671 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 7 Apr 2013 20:56:10 +0200
Subject: [PATCH 11/16] - updated to 1.7.6.1 - updated wayland patch - added
 fribidi patch

---
 evas-fribidi.patch | 10 ++++++++++
 evas-wayland.patch |  9 ---------
 evas.spec          |  6 ++++--
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 evas-fribidi.patch

diff --git a/evas-fribidi.patch b/evas-fribidi.patch
new file mode 100644
index 0000000..73119a1
--- /dev/null
+++ b/evas-fribidi.patch
@@ -0,0 +1,10 @@
+--- evas-1.7.6.1/src/lib/engines/common_8/Makefile.am.orig	2012-11-23 17:35:06.000000000 +0100
++++ evas-1.7.6.1/src/lib/engines/common_8/Makefile.am	2013-04-07 19:29:09.633616777 +0200
+@@ -6,6 +6,7 @@
+ -I$(top_srcdir)/src/lib \
+ -I$(top_srcdir)/src/lib/include \
+ @FREETYPE_CFLAGS@ \
++@FRIBIDI_CFLAGS@ \
+ @PIXMAN_CFLAGS@ \
+ @VALGRIND_CFLAGS@ \
+ @EVAS_GENERAL_CFLAGS@ \
diff --git a/evas-wayland.patch b/evas-wayland.patch
index c14a42d..db43e11 100644
--- a/evas-wayland.patch
+++ b/evas-wayland.patch
@@ -26,15 +26,6 @@
  #    include <GLES2/gl2.h>
  #    include <GLES2/gl2ext.h>
  #   endif
-@@ -341,7 +341,7 @@
-    /* If this is set: Force drawing with a particular filter */
-    GLuint	filter_prog;
- 
--#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-+#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND)
- // FIXME: hack. expose egl display to gl core for egl image sec extn.
-    void *egldisp;
- #endif
 @@ -633,7 +633,7 @@
  extern void (*glsym_glProgramParameteri)    (GLuint a, GLuint b, GLint d);
  extern void (*glsym_glReleaseShaderCompiler)(void);
diff --git a/evas.spec b/evas.spec
index c5b6ae5..d784ac1 100644
--- a/evas.spec
+++ b/evas.spec
@@ -37,13 +37,14 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.5
+Version:	1.7.6.1
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	2c965b836128a839292161d4ca89380d
+# Source0-md5:	65d40c3fd08a815efe50cf77c40b5c64
 Patch0:		%{name}-wayland.patch
+Patch1:		%{name}-fribidi.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
 BuildRequires:	Mesa-libGLU-devel
@@ -484,6 +485,7 @@ Moduł zapisywania obrazów TIFF dla Evas.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
-- 
2.43.0


From 9d8c6963fd4362248291255c2e430aad49c9a4df Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Fri, 19 Jul 2013 11:13:15 +0200
Subject: [PATCH 12/16] - rebuild with DirectFB 1.7.0 - release 2 (by relup.sh)

---
 evas.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evas.spec b/evas.spec
index d784ac1..cb821f5 100644
--- a/evas.spec
+++ b/evas.spec
@@ -38,7 +38,7 @@ Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
 Version:	1.7.6.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-- 
2.43.0


From 1ff38998e8e6f5a50b489134c08aa3198f906659 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 21 Jul 2013 07:57:31 +0200
Subject: [PATCH 13/16] - updated to 1.7.7

---
 evas.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evas.spec b/evas.spec
index cb821f5..1231528 100644
--- a/evas.spec
+++ b/evas.spec
@@ -37,12 +37,12 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.6.1
-Release:	2
+Version:	1.7.7
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	65d40c3fd08a815efe50cf77c40b5c64
+# Source0-md5:	6f6bd375c37c3b01b9a4c622a77e72c6
 Patch0:		%{name}-wayland.patch
 Patch1:		%{name}-fribidi.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
-- 
2.43.0


From 36fd05eea9898f9314fdb77f46fb1be954e7d322 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 29 Oct 2013 14:35:38 +0100
Subject: [PATCH 14/16] - release 2 (by relup.sh)

---
 evas.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evas.spec b/evas.spec
index 1231528..c028635 100644
--- a/evas.spec
+++ b/evas.spec
@@ -38,7 +38,7 @@ Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
 Version:	1.7.7
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-- 
2.43.0


From fd6d2cc3b9d365fd7c0f4a6082190a58b9ae29f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 3 Nov 2013 14:02:21 +0100
Subject: [PATCH 15/16] - release 3 (by relup.sh)

---
 evas.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evas.spec b/evas.spec
index c028635..a2fa9e7 100644
--- a/evas.spec
+++ b/evas.spec
@@ -38,7 +38,7 @@ Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
 Version:	1.7.7
-Release:	2
+Release:	3
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-- 
2.43.0


From dc675429c01ce963f930a52ee4755248ca739413 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 23 Nov 2013 22:38:12 +0100
Subject: [PATCH 16/16] - updated to 1.7.9

---
 evas.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/evas.spec b/evas.spec
index a2fa9e7..956828b 100644
--- a/evas.spec
+++ b/evas.spec
@@ -33,16 +33,17 @@
 #
 %define		edb_ver		1.0.5.043
 %define		eet_ver 	1.7.0
+%define		eina_ver 	1.7.9
 
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	1.7.7
-Release:	3
+Version:	1.7.9
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	6f6bd375c37c3b01b9a4c622a77e72c6
+# Source0-md5:	2d88658779c4cd836d8a3735435d6bb6
 Patch0:		%{name}-wayland.patch
 Patch1:		%{name}-fribidi.patch
 URL:		http://trac.enlightenment.org/e/wiki/Evas
@@ -53,7 +54,7 @@ BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1.6
 BuildRequires:	edb-devel >= %{edb_ver}
 BuildRequires:	eet-devel >= %{eet_ver}
-BuildRequires:	eina-devel >= 1.6.0
+BuildRequires:	eina-devel >= %{eina_ver}
 %{?with_svg:BuildRequires:	esvg-devel >= 0.0.16}
 BuildRequires:	fontconfig-devel >= 2.5.0
 BuildRequires:	freetype-devel >= 1:2.2
@@ -80,7 +81,7 @@ BuildRequires:	Mesa-libwayland-egl-devel
 BuildRequires:	wayland-devel
 %endif
 Requires:	eet >= %{eet_ver}
-Requires:	eina >= 1.6.0
+Requires:	eina >= %{eina_ver}
 Requires:	freetype >= 1:2.2
 Requires:	fribidi >= 0.19.2
 Requires:	harfbuzz >= 0.9.0
@@ -108,7 +109,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe Evas
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	eet-devel >= %{eet_ver}
-Requires:	eina-devel >= 1.6.0
+Requires:	eina-devel >= %{eina_ver}
 Requires:	fontconfig-devel >= 2.5.0
 Requires:	freetype-devel >= 1:2.2
 Requires:	fribidi-devel >= 0.19.2
-- 
2.43.0