Upstream merge

Change-Id: I396a5b4ba0498df82e00ef01e639b7bde71889cc

diff --git a/data/Makefile.am b/data/Makefile.am
index db772b1..0d98574 100644 (file)
--- 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 (file)
--- 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/