TIVI-1069: enable ecore examples

Change-Id: I6bc943f1fc5a824ba85fe5f0b6ba0d65b37f0fda

diff --git a/packaging/ecore.changes b/packaging/ecore.changes
index b574b3e..1c954fd 100644 (file)
--- a/packaging/ecore.changes
+++ b/packaging/ecore.changes
@@ -1,3 +1,6 @@
+* Thu Jun 27 23:06:24 UTC 2013 - tracy.graydon@intel.com
+- TIVI-1069: Enable ecore examples, using libdir as the install dir 
+
 * Wed Jun 05 2013 Rusty Lynch <rusty.lynch@intel.com> upstream/1.7.5@bdb5cab
 - Update to release 1.7.7
 

diff --git a/packaging/ecore.spec b/packaging/ecore.spec
index 24ee780..6d8c555 100644 (file)
--- a/packaging/ecore.spec
+++ b/packaging/ecore.spec
@@ -3,7 +3,7 @@
 Name:           ecore
 Version:        1.7.7
 Release:        1
-License:        BSD 2-clause
+License:        BSD-2-clause
 Summary:        Enlightened Core X interface library
 Url:            http://www.enlightenment.org
 Group:          Graphics/EFL
@@ -44,9 +44,17 @@ Ecore is the event/X abstraction layer that makes doing selections,
 Xdnd, general X stuff, event loops, timeouts and idle handlers fast,
 optimized, and convenient.
 
+%package examples
+Summary:    Enlightened Core examples
+Group:      Graphics & UI Framework/Development
+Requires:   %{name} = %{version}-%{release}
+
+%description examples
+Enlightened Core examples
+
 %package devel
 Summary:        Development components for the ecore package
-Group:          Development/Libraries
+Group:          Development/Building
 Requires:       %{name} = %{version}
 
 %description devel
@@ -56,7 +64,7 @@ Development files for ecore
 %setup -q
 
 %build
-%configure \
+%reconfigure --enable-build-examples \
 %if %{with wayland}
     --enable-ecore-wayland \
     --enable-ecore-evas-wayland-egl \
@@ -81,6 +89,10 @@ make %{?_smp_mflags}
 %{_libdir}/libecore*.so.*
 %{_libdir}/ecore/immodules/xim.so
 
+%files examples
+%defattr(-,root,root,-)
+%{_libdir}/ecore/examples/*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/ecore-1/*.h

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 00ea91d..e25a2ff 100644 (file)
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-examplesdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(libdir)/$(PACKAGE)/examples
 
-filesdir = $(datadir)/$(PACKAGE)/examples
+filesdir = $(libdir)/$(PACKAGE)/examples
 files_DATA =
 
 AM_CPPFLAGS = \
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_evas \
 -I$(top_srcdir)/src/lib/ecore_input \
 -I$(top_srcdir)/src/lib/ecore_con \
--DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
+-DPACKAGE_EXAMPLES_DIR=\"$(libdir)/$(PACKAGE)/examples\" \
 @GLIB_CFLAGS@ @EVIL_CFLAGS@ @EVAS_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@
 
 ECOREBASELDADD = \