From ad112f80bb3910d65ec223a7fcc4af7cad27033a Mon Sep 17 00:00:00 2001
From: Rui Seabra <rms@1407.org>
Date: Fri, 21 Jan 2011 21:38:01 +0000
Subject: [PATCH] Assorted fixes for building RPMS, probably a good thing that
 the release source archives can generate the rpms as expected.

SVN revision: 56257
---
 legacy/ecore/ecore.spec.in   | 4 ++--
 legacy/edje/edje.spec.in     | 1 -
 legacy/efreet/efreet.spec.in | 2 +-
 legacy/embryo/embryo.spec.in | 2 +-
 legacy/evas/evas.spec.in     | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/legacy/ecore/ecore.spec.in b/legacy/ecore/ecore.spec.in
index 49a4e6befe..3b5682e6f3 100644
--- a/legacy/ecore/ecore.spec.in
+++ b/legacy/ecore/ecore.spec.in
@@ -146,7 +146,7 @@ Requires: %{name} = %{version}
 Ecore functions for dealing with the X Windows System
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 CFLAGS="-I/usr/kerberos/include -I/usr/X11R6/include/X11/extensions"
@@ -186,7 +186,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 %{_libdir}/pkgconfig/*
 #%{_datadir}/aclocal/*
-%{_includedir}/*.h
+%{_includedir}/ecore-1/*.h
 
 %files con
 %defattr(-, root, root)
diff --git a/legacy/edje/edje.spec.in b/legacy/edje/edje.spec.in
index 94c83c58c4..1d6e2a7b13 100644
--- a/legacy/edje/edje.spec.in
+++ b/legacy/edje/edje.spec.in
@@ -91,7 +91,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %files bin
 %defattr(-, root, root)
 %{_bindir}/edje_cc
-%{_bindir}/edje_convert
 %{_bindir}/edje_decc
 %{_bindir}/edje_recc
 %{_bindir}/edje_player
diff --git a/legacy/efreet/efreet.spec.in b/legacy/efreet/efreet.spec.in
index ee2f9d128b..a53eb6a3fc 100644
--- a/legacy/efreet/efreet.spec.in
+++ b/legacy/efreet/efreet.spec.in
@@ -59,7 +59,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/%{name}
+%{_includedir}/%{name}-1
 %{_libdir}/*.so
 %{_libdir}/*.la
 %{_libdir}/*.a
diff --git a/legacy/embryo/embryo.spec.in b/legacy/embryo/embryo.spec.in
index 0f2330ea4c..620cee939b 100644
--- a/legacy/embryo/embryo.spec.in
+++ b/legacy/embryo/embryo.spec.in
@@ -72,6 +72,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.la
 %{_libdir}/*.a
 %{_libdir}/pkgconfig/*
-%{_includedir}/*.h
+%{_includedir}/embryo-1/*.h
 
 %changelog
diff --git a/legacy/evas/evas.spec.in b/legacy/evas/evas.spec.in
index 9ef36ae010..f2284a5f99 100644
--- a/legacy/evas/evas.spec.in
+++ b/legacy/evas/evas.spec.in
@@ -391,7 +391,7 @@ Xrender XCB X11 rendering engine module for Evas
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 %{configure} --prefix=%{_prefix} --x-libraries=%{_prefix}/X11R6/%{_lib} \
@@ -450,7 +450,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.la
 %{_libdir}/*.a
 %{_libdir}/pkgconfig/*
-%{_includedir}/*.h
+%{_includedir}/evas-1/*.h
 %{_datadir}/evas/examples/*.c
 %files module_engine_software_generic
 %defattr(-, root, root)