packages: edje/edje.spec, edje/edje-deps.patch (NEW), edje/automake.patch (...

Thu May 31 19:26:06 CEST 2012

Author: qboosh                       Date: Thu May 31 17:26:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.0
- removed obsolete automake patch
- added deps patch to avoid extraneous dependencies in edje.pc
- added remix bcond

---- Files affected:
packages/edje:
   edje.spec (1.55 -> 1.56) , edje-deps.patch (NONE -> 1.1)  (NEW), automake.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/edje/edje.spec
diff -u packages/edje/edje.spec:1.55 packages/edje/edje.spec:1.56

--- packages/edje/edje.spec:1.55	Mon Jan 23 11:24:42 2012
+++ packages/edje/edje.spec	Thu May 31 19:26:00 2012
@@ -2,23 +2,26 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
+%bcond_without	remix		# remix support
 #
-%define		ecore_ver	1.1.0
-%define		eet_ver 	1.5.0
-%define		eina_ver	1.1.0
-%define		embryo_ver	1.1.0
-%define		evas_ver	1.1.0
+%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
 Summary:	Complex Graphical Design/Layout Engine
 Summary(pl.UTF-8):	Złożony silnik graficznego projektowania/planowania
 Name:		edje
-Version:	1.1.0
-Release:	3
+Version:	1.2.0
+Release:	1
 License:	BSD
 Group:		X11/Libraries
 Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	c51cbc0c0d8f93ceadfb2173c2f9135c
-Patch0:		automake.patch
+# Source0-md5:	a83d5a6ec65f135fb33625602ffc4696
+Patch0:		%{name}-deps.patch
 URL:		http://trac.enlightenment.org/e/wiki/Edje
+# for alsa_snd_player plugin for remix
+%{?with_remix:BuildRequires:	alsa-lib-devel >= 1.0.21}
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
 BuildRequires:	ecore-devel >= %{ecore_ver}
@@ -30,14 +33,23 @@
 BuildRequires:	eet-devel >= %{eet_ver}
 BuildRequires:	embryo-devel >= %{embryo_ver}
 BuildRequires:	evas-devel >= %{evas_ver}
+BuildRequires:	flac-devel >= 1.2.1
+BuildRequires:	libogg-devel >= 1:1.1.4
+BuildRequires:	libsndfile-devel >= 1.0.21
+BuildRequires:	libvorbis-devel >= 1:1.2.3
 BuildRequires:	libtool
 BuildRequires:	lua51 >= 5.1.0
 BuildRequires:	pkgconfig >= 1:0.22
 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
+Requires:	libogg >= 1:1.1.4
+Requires:	libvorbis >= 1:1.2.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %undefine	__cxx
@@ -89,6 +101,8 @@
 Requires:	eet >= %{eet_ver}
 Requires:	embryo >= %{embryo_ver}
 Requires:	evas >= %{evas_ver}
+Requires:	libsndfile >= 1.0.21
+%{?with_remix:Requires:	remix >= 0.2.4}
 
 %description libs
 Edje library.
@@ -108,6 +122,8 @@
 Requires:	eet-devel >= %{eet_ver}
 Requires:	embryo-devel >= %{embryo_ver}
 Requires:	evas-devel >= %{evas_ver}
+Requires:	libsndfile-devel >= 1.0.21
+%{?with_remix:Requires:	remix-devel >= 0.2.4}
 
 %description devel
 Header files for Edje.
@@ -151,6 +167,7 @@
 %{__automake}
 %configure \
 	--disable-silent-rules \
+	%{!?with_remix:--disable-remix} \
 	%{!?with_static_libs:--disable-static} \
 	--enable-edje-cc \
 	--with-vim=/usr/share/vim/vimfiles
@@ -165,6 +182,11 @@
 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -192,6 +214,13 @@
 %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
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -216,6 +245,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2012/05/31 17:26:00  qboosh
+- updated to 1.2.0
+- removed obsolete automake patch
+- added deps patch to avoid extraneous dependencies in edje.pc
+- added remix bcond
+
 Revision 1.55  2012/01/23 10:24:42  zbyniu
 - R: eina, not eina-devel in -libs; rel 3
 

================================================================
Index: packages/edje/edje-deps.patch
diff -u /dev/null packages/edje/edje-deps.patch:1.1
--- /dev/null	Thu May 31 19:26:06 2012
+++ packages/edje/edje-deps.patch	Thu May 31 19:26:00 2012
@@ -0,0 +1,31 @@
+Don't add packages not required by edje library to edje.pc Requires list
+--- edje-1.2.0/configure.ac.orig	2012-04-26 06:30:28.000000000 +0200
++++ edje-1.2.0/configure.ac	2012-05-30 17:46:44.128074454 +0200
+@@ -373,7 +373,6 @@
+       [
+        AC_DEFINE(HAVE_VORBIS, 1, [vorbis support for Edje])
+        have_vorbis="yes"
+-       requirement_edje="ogg >= 1.1.4 vorbis >= 1.2.3 vorbisenc >= 1.2.3 ${requirement_edje}"
+       ],
+       [have_vorbis="no"; want_multisense="no"]
+    )
+@@ -398,7 +397,6 @@
+       [
+        AC_DEFINE(HAVE_LIBALSA, 1, [ALSA support for Edje])
+        have_alsa_lib="yes"
+-       requirement_edje="alsa >= 1.0.21 ${requirement_edje}"
+       ],
+       [have_alsa_lib="no"; want_multisense="no"]
+    )
+@@ -425,11 +423,6 @@
+       [
+        AC_DEFINE(HAVE_LIBFLAC, 1, [flac support for Edje])
+        have_flac_lib="yes"
+-       # disabled because this adds flac include dirs to cflags... and
+-       # FLAC has an assert.h in its include dirs that ends up
+-       # overriding the system assert.h and thus causes all sorts of
+-       # mayhem
+-       #requirement_edje="flac >= 1.2.1 ${requirement_edje}"
+       ],
+       [have_flac_lib="no"; want_multisense="no"]
+    )
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/edje/edje.spec?r1=1.55&r2=1.56

