Author: qboosh Date: Sat Jan 21 19:23:34 2012 GMT Module: packages Tag: HEAD ---- Log message: - added am patch to fix build with automake 1.11.2 - fix v_rev in configure (propagated to .pc file)
---- Files affected: packages/emotion: emotion.spec (1.27 -> 1.28) , emotion-am.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/emotion/emotion.spec diff -u packages/emotion/emotion.spec:1.27 packages/emotion/emotion.spec:1.28 --- packages/emotion/emotion.spec:1.27 Tue Dec 13 18:20:56 2011 +++ packages/emotion/emotion.spec Sat Jan 21 20:23:29 2012 @@ -22,6 +22,7 @@ Group: Libraries Source0: http://download.enlightenment.org/snapshots/LATEST/%{name}-%{version}.tar.bz2 # Source0-md5: 1c4fb7c26f4324f4fcc343d6baa21e42 +Patch0: %{name}-am.patch URL: http://trac.enlightenment.org/e/wiki/Emotion BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1.6 @@ -42,6 +43,7 @@ %endif BuildRequires: libtool BuildRequires: pkgconfig >= 1:0.22 +BuildRequires: sed >= 4.0 %{?with_vlc:BuildRequires: vlc-devel >= 0.9} %{?with_xine:BuildRequires: xine-lib-devel >= 2:1.1.1} Requires: ecore >= %{ecore_ver} @@ -137,6 +139,10 @@ %prep %setup -q +%patch0 -p1 + +# fix version for tarball not being svn checkout +%{__sed} -i -e 's/^m4_define.*v_rev.*svnversion.*/m4_define([v_rev], [65643])/' configure.ac %build %{__libtoolize} @@ -223,6 +229,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2012/01/21 19:23:29 qboosh +- added am patch to fix build with automake 1.11.2 +- fix v_rev in configure (propagated to .pc file) + Revision 1.27 2011/12/13 17:20:56 qboosh - updated to 0.2.0.65643 ================================================================ Index: packages/emotion/emotion-am.patch diff -u /dev/null packages/emotion/emotion-am.patch:1.1 --- /dev/null Sat Jan 21 20:23:34 2012 +++ packages/emotion/emotion-am.patch Sat Jan 21 20:23:29 2012 @@ -0,0 +1,28 @@ +--- emotion-0.2.0.65643/src/examples/Makefile.am.orig 2011-09-16 10:19:30.000000000 +0200 ++++ emotion-0.2.0.65643/src/examples/Makefile.am 2012-01-21 20:17:10.991529261 +0100 +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + +-pkglibdir = $(datadir)/$(PACKAGE)/examples ++pkgbindir = $(datadir)/$(PACKAGE)/examples + + AM_CPPFLAGS = \ + -I. \ +@@ -22,7 +22,7 @@ + + EXTRA_DIST = $(SRCS) + +-pkglib_PROGRAMS = ++pkgbin_PROGRAMS = + + if EFL_INSTALL_EXAMPLES + filesdir = $(datadir)/$(PACKAGE)/examples +@@ -30,7 +30,7 @@ + endif + + if EFL_BUILD_EXAMPLES +-pkglib_PROGRAMS += \ ++pkgbin_PROGRAMS += \ + emotion_basic_example \ + emotion_generic_example \ + emotion_border_example \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emotion/emotion.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
