From c8c07c99ba02d791a6a36fe11537a11b0b46bb02 Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Wed, 20 Jun 2012 17:36:56 +0900 Subject: [PATCH] Upstream merge Change-Id: I396a5b4ba0498df82e00ef01e639b7bde71889cc --- data/Makefile.am | 2 +- packaging/emotion.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index db772b1..0d98574 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data +EDJE_FLAGS = -nothreads -v -id $(top_srcdir)/data -fd $(top_srcdir)/data filesdir = $(datadir)/$(PACKAGE)/data diff --git a/packaging/emotion.spec b/packaging/emotion.spec index 4eef916..f340611 100644 --- a/packaging/emotion.spec +++ b/packaging/emotion.spec @@ -1,7 +1,7 @@ Name: emotion Summary: Media Library -Version: 1.0.0+svn.70375slp2+build02 -Release: 2 +Version: 1.0.0+svn.72193slp2+build01 +Release: 1 Group: System Environment/Libraries License: BSD URL: http://www.enlightenment.org/ -- 2.7.4