From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 6 Sep 2012 13:29:46 +0000 (+0200)
Subject: - updated to 1.7.0
X-Git-Tag: auto/th/edje-1.7.0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fedje.git;a=commitdiff_plain;h=b4598747b3fa0163b2dcac5ae80562f54a77a147;ds=sidebyside

- updated to 1.7.0
- multisense is forcily disabled by upstream; thus, remix support cannot be built
---

diff --git a/edje.spec b/edje.spec
index 810acf9..60e27ac 100644
--- a/edje.spec
+++ b/edje.spec
@@ -1,22 +1,23 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
-%bcond_without	remix		# remix support
+%bcond_with	remix		# remix support (not used now as multisense is disabled)
 #
-%define		ecore_ver	1.2.0
-%define		eet_ver 	1.6.0
-%define		eina_ver	1.2.0
-%define		embryo_ver	1.2.0
-%define		evas_ver	1.2.0
+%define		ecore_ver	1.7.0
+%define		eet_ver 	1.7.0
+%define		eina_ver	1.7.0
+%define		eio_ver		1.7.0
+%define		embryo_ver	1.7.0
+%define		evas_ver	1.7.0
 Summary:	Complex Graphical Design/Layout Engine
 Summary(pl.UTF-8):	Złożony silnik graficznego projektowania/planowania
 Name:		edje
-Version:	1.2.1
+Version:	1.7.0
 Release:	1
 License:	BSD
 Group:		X11/Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	880c390fdc279818bd88e5de1aa50893
+# Source0-md5:	489b667a122891a16de35a2c90d41b52
 Patch0:		%{name}-deps.patch
 URL:		http://trac.enlightenment.org/e/wiki/Edje
 # for alsa_snd_player plugin for remix
@@ -29,6 +30,7 @@ BuildRequires:	ecore-file-devel >= %{ecore_ver}
 BuildRequires:	ecore-imf-devel >= %{ecore_ver}
 BuildRequires:	ecore-imf-evas-devel >= %{ecore_ver}
 BuildRequires:	eina-devel >= %{eina_ver}
+BuildRequires:	eio-devel >= %{eio_ver}
 BuildRequires:	eet-devel >= %{eet_ver}
 BuildRequires:	embryo-devel >= %{embryo_ver}
 BuildRequires:	evas-devel >= %{evas_ver}
@@ -43,7 +45,6 @@ BuildRequires:	python >= 1:2.5
 %{?with_remix:BuildRequires:	remix-devel >= 0.2.4}
 %{?with_remix:Requires:	alsa-lib >= 1.0.21}
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	eina >= %{eina_ver}
 Requires:	evas-engine-buffer >= %{evas_ver}
 Requires:	evas-loader-png >= %{evas_ver}
 Requires:	flac >= 1.2.1
@@ -97,6 +98,7 @@ Requires:	ecore-file >= %{ecore_ver}
 Requires:	ecore-imf >= %{ecore_ver}
 Requires:	ecore-imf-evas >= %{ecore_ver}
 Requires:	eina >= %{eina_ver}
+Requires:	eio >= %{eio_ver}
 Requires:	eet >= %{eet_ver}
 Requires:	embryo >= %{embryo_ver}
 Requires:	evas >= %{evas_ver}
@@ -119,6 +121,7 @@ Requires:	ecore-file-devel >= %{ecore_ver}
 Requires:	ecore-imf-devel >= %{ecore_ver}
 Requires:	ecore-imf-evas-devel >= %{ecore_ver}
 Requires:	eet-devel >= %{eet_ver}
+Requires:	eio-devel >= %{eio_ver}
 Requires:	embryo-devel >= %{embryo_ver}
 Requires:	evas-devel >= %{evas_ver}
 Requires:	libsndfile-devel >= 1.0.21
@@ -181,7 +184,6 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/edje/modules
 install -D data/edc.vim $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/syntax/edc.vim
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*/linux-gnu-*/module.la
 %if %{with remix}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/remix/*.la
 %endif
@@ -201,6 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/edje_inspector
 %attr(755,root,root) %{_bindir}/edje_player
 %attr(755,root,root) %{_bindir}/edje_recc
+%attr(755,root,root) %{_bindir}/edje_watch
 %attr(755,root,root) %{_bindir}/inkscape2edc
 %dir %{_libdir}/%{name}/utils
 %attr(755,root,root) %dir %{_libdir}/%{name}/utils/epp
@@ -213,9 +216,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libedje.so.1
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules
-%dir %{_libdir}/%{name}/modules/multisense_factory
-%dir %{_libdir}/%{name}/modules/multisense_factory/linux-gnu-*
-%attr(755,root,root) %{_libdir}/%{name}/modules/multisense_factory/linux-gnu-*/module.so
 %if %{with remix}
 %attr(755,root,root) %{_libdir}/remix/libalsa_snd_player.so
 %attr(755,root,root) %{_libdir}/remix/libeet_sndfile_reader.so