diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index b84abce5d0..1cc149281b 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -5,7 +5,7 @@ rm -f config.cache
 
 AC_INIT(configure.in)
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(evas, 1.0.0-pre5)
+AM_INIT_AUTOMAKE(evas, 1.0.0_pre5)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
@@ -94,7 +94,7 @@ gl_libs=""
 qt_dir=""
 qt_cflags=""
 qt_libs=""				 
-qt_moc=""
+qt_moc="moc"
 
 # blah-config style checks
 # qtdir setting
diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec
index b102586f80..10ea9ab40f 100644
--- 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-pre5
+%define ver      1.0.0_pre5
 %define rel      1
 %define prefix   /usr
 
@@ -25,6 +25,7 @@ Requires: libpng >= 1.0.0
 Requires: libjpeg
 Requires: eet
 Requires: edb
+Provides: evas evas_software_x11 evas_loader_png evas_loader_jpeg evas_loader_eet evas_loader_edb
 
 Docdir: %{prefix}/doc
 
@@ -76,17 +77,16 @@ rm -rf $RPM_BUILD_ROOT
 --enable-convert-32-rgbx-8888 \
 --enable-convert-32-bgr-8888 \
 --enable-convert-32-bgrx-8888 \
---enable-convert-32-rgb-rot-0
+--enable-convert-32-rgb-rot-0 \
 --enable-convert-32-rgb-rot-90 \
---enable-convert-32-rgb-rot-270 \
+--enable-convert-32-rgb-rot-270
 
 make CFLAGS="-O2 -mpentiumpro -march=pentiumpro -mcpu=pentiumpro"
 
 ###########################################################################
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/legacy/evas/src/bin/Makefile.am b/legacy/evas/src/bin/Makefile.am
index 4cb59d973d..29805c1558 100644
--- a/legacy/evas/src/bin/Makefile.am
+++ b/legacy/evas/src/bin/Makefile.am
@@ -59,6 +59,7 @@ evas_fb_test_LDFLAGS = $(LDFLAGS)
 evas_fb_test_CFLAGS = $(CFLAGS)
 evas_fb_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
 
+if BUILD_ENGINE_SOFTWARE_QTOPIA
 moc_evas_software_qtopia_main.cpp: evas_software_qtopia_main.h
 	@qt_moc@ evas_software_qtopia_main.h -o moc_evas_software_qtopia_main.cpp
 
@@ -68,9 +69,12 @@ evas_software_qtopia_test_LDFLAGS = $(LDFLAGS)
 evas_software_qtopia_test_CFLAGS = $(CFLAGS) @qt_cflags@
 evas_software_qtopia_test_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) @qt_cflags@
 evas_software_qtopia_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
+endif
 
 evas_gl_x11_test_SOURCES = evas_test_main.h evas_test_main.c evas_gl_x11_main.c
 evas_gl_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ @gl_libs@
 evas_gl_x11_test_LDFLAGS = $(LDFLAGS)
 evas_gl_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ @gl_cflags@
 evas_gl_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
+
+EXTRA_DIST = evas_software_qtopia_main.h evas_software_qtopia_main.cpp