* assorted fixes for RPM-building

SVN revision: 8200

diff --git a/legacy/ecore/ecore.spec b/legacy/ecore/ecore.spec
index 001b45114f557b7a517c78a8700a641ab990c4a4..26fea767c389fd9d4f3701eef2a287e32bc64c18 100644 (file)
--- a/legacy/ecore/ecore.spec
+++ b/legacy/ecore/ecore.spec
@@ -37,6 +37,7 @@ Ecore development files
 --enable-ecore-evas \
 --enable-ecore-job \
 --enable-ecore-con \
+--enable-ecore-config \
 --enable-ecore-ipc
 
 make
@@ -58,13 +59,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{prefix}/lib/libecore*.so.*
 %{prefix}/lib/libecore*.la
 %attr(755,root,root) %{prefix}/bin/ecore_*
+%attr(755,root,root) %{prefix}/bin/exsh
 %{prefix}/share/ecore
 
 %files devel
 %defattr(-,root,root)
 %attr(755,root,root) %{prefix}/lib/libecore*.so
 %attr(755,root,root) %{prefix}/lib/libecore*.a
+%attr(755,root,root) %{prefix}/lib/libecore*.la
+%attr(755,root,root) %{prefix}/lib/ecore_config_ipc_*.so
+%attr(755,root,root) %{prefix}/lib/ecore_config_ipc_*.a
+%attr(755,root,root) %{prefix}/lib/ecore_config_ipc_*.la
 %attr(755,root,root) %{prefix}/bin/ecore-config
+%{prefix}/share/aclocal/ecore.m4
 %{prefix}/include/Ecore*.h
 %doc AUTHORS
 %doc COPYING

diff --git a/legacy/ecore/src/lib/ecore_config/Makefile.am b/legacy/ecore/src/lib/ecore_config/Makefile.am
index c5a774a9866cd09ae7259a3845a84469420a754e..0edcb57da2766a132a193408ac6efc632eeec51b 100644 (file)
--- a/legacy/ecore/src/lib/ecore_config/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_config/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_ipc
 
+if BUILD_ECORE_CONFIG
+
 libecore_config_la_LDFLAGS = -version-info 1:0:0 \
 -L$(top_builddir)/src/lib/ecore/.libs
 
-if BUILD_ECORE_CONFIG
-
 lib_LTLIBRARIES = libecore_config.la
 include_HEADERS = \
 Ecore_Config.h

diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec
index 43e6de5e30806c8c6c81b63b4716ad1584b77b68..2b5e9b7323d3745c4c29a964c305f6b562d6f8af 100644 (file)
--- a/legacy/evas/evas.spec
+++ b/legacy/evas/evas.spec
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      1.0.0_pre11
+%define ver      1.0.0_pre12
 %define rel      1
 %define prefix   /usr
 
@@ -14,13 +14,13 @@ BuildRoot: /var/tmp/evas-root
 Packager: The Rasterman <raster@rasterman.com>
 URL: http://www.enlightenment.org/
 BuildRequires: XFree86-devel
-BuildRequires: freetype-devel
+BuildRequires: freetype2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: eet-devel
 BuildRequires: edb-devel
 Requires: XFree86
-Requires: freetype >= 2.0.0
+Requires: freetype2 >= 2.0.0
 Requires: libpng >= 1.0.0
 Requires: libjpeg
 Requires: eet