X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=evas.spec;h=aa5cdf35611427e842fd19ef6252719dec14cb1c;hb=d47fe94bc0e8aab5fe5840b802638066a777139e;hp=379e023d6beb125b5cc1c9288fcc987309f1bec2;hpb=353188a7367477a58bdedc32720c01ddb09bc69a;p=packages%2Fevas.git

diff --git a/evas.spec b/evas.spec
index 379e023..aa5cdf3 100644
--- a/evas.spec
+++ b/evas.spec
@@ -3,11 +3,13 @@
 %bcond_without	mmx		# without MMX and MMX2
 %bcond_without	sse		# without SSE
 %bcond_without	altivec		# without altivec
+%bcond_without	directfb	# build without DirectFB support
+%bcond_without	static_libs	# don't build static library
 #
-%ifnarch i586 i686 athlon
+%ifnarch i586 i686 athlon %{x8664}
 %undefine	with_mmx
 %endif
-%ifnarch i686 athlon
+%ifnarch i686 athlon %{x8664}
 %undefine	with_sse
 %endif
 %ifnarch ppc
@@ -17,15 +19,14 @@
 Summary:	Multi-platform Canvas Library
 Summary(pl):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	0.9.9.020
+Version:	0.9.9.029
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	8dce18134e2ca1922bab69387741f4e7
-Patch0:		%{name}-missing_m4.patch
+# Source0-md5:	734eba6985237ebfe19ce8aaa4f98bd4
 URL:		http://enlightenment.org/Libraries/Evas/
-BuildRequires:	DirectFB-devel
+%{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -40,6 +41,8 @@ Requires:	%{name}-libs = %{version}-%{release}
 Requires:	fonts-TTF-bitstream-vera
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%undefine	__cxx
+
 %description
 Evas is a clean display canvas API for several target display systems
 that can draw anti-aliased text, smooth super and sub-sampled scaled
@@ -66,7 +69,7 @@ Summary:	Evas header files
 Summary(pl):	Pliki nag³ówkowe Evas
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	DirectFB-devel
+%{?with_directfb:Requires:	DirectFB-devel}
 Requires:	OpenGL-devel
 Requires:	edb-devel
 Requires:	eet-devel
@@ -94,18 +97,13 @@ Statyczna biblioteka Evas.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
+	%{!?with_static_libs:--disable-static} \
 	--enable-software-x11 	\
 	--disable-software-xcb	\
-	--enable-directfb	\
+	--%{?with_directfb:en}%{!?with_directfb:dis}able-directfb	\
 	--enable-fb		\
 	--enable-buffer		\
 	--disable-software-qtopia \
@@ -164,6 +162,12 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libevas.so.*.*.*
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%dir %{_libdir}/%{name}/modules/*
+%dir %{_libdir}/%{name}/modules/*/*
+%dir %{_libdir}/%{name}/modules/*/*/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/*/*/linux-gnu-*/module.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -173,6 +177,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/evas.pc
 %{_includedir}/Evas*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libevas.a
+%endif