Wed Jul 23 00:10:13 2008 Michael Jennings (mej)

distcheck and spec fixes
----------------------------------------------------------------------

SVN revision: 35187

diff --git a/legacy/ecore/ecore.spec.in b/legacy/ecore/ecore.spec.in
index cdfa7d5..78a0ce9 100644 (file)
--- a/legacy/ecore/ecore.spec.in
+++ b/legacy/ecore/ecore.spec.in
@@ -22,6 +22,7 @@
 ## enabled features
 ##%bcond_without module_engine_software_x11
 %bcond_without lib_ecore_fb
+%bcond_without lib_ecore_imf
 
 # This just keeps a missing doxygen from killing the build.
 %define _missing_doc_files_terminate_build 0
@@ -29,8 +30,9 @@
 %define breq_lib_ecore_directfb     %{?with_lib_ecore_directfb:DirectFB}
 %define breq_lib_ecore_sdl          %{?with_lib_ecore_sdl:SDL-devel}
 
-%define ac_with_lib_ecore_fb        --%{?with_lib_ecore_fb:en}%{!?with_lib_ecore_fb:dis}able-ecore-fb
 %define ac_with_lib_ecore_directfb  --%{?with_lib_ecore_directfb:en}%{!?with_lib_ecore_directfb:dis}able-ecore-directfb
+%define ac_with_lib_ecore_fb        --%{?with_lib_ecore_fb:en}%{!?with_lib_ecore_fb:dis}able-ecore-fb
+%define ac_with_lib_ecore_imf       --%{?with_lib_ecore_imf:en}%{!?with_lib_ecore_imf:dis}able-ecore-imf
 %define ac_with_lib_ecore_sdl       --%{?with_lib_ecore_sdl:en}%{!?with_lib_ecore_sdl:dis}able-ecore-sdl
 
 Summary: Enlightened Core X interface library
@@ -44,7 +46,7 @@ URL: http://www.enlightenment.org
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-#BuildSuggests: xorg-x11-devel, XFree86-devel
+#BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel
 BuildRequires: libjpeg-devel, openssl-devel %{?breq_lib_ecore_directfb}
 BuildRequires: curl-devel, evas-devel, eet-devel %{?breq_lib_ecore_sdl}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -124,6 +126,15 @@ Requires: %{name} = %{version}
 %description file
 Ecore File Library
 
+%if %{with lib_ecore_imf}
+%package imf
+Summary: Ecore IMF functions
+Group: Development/Libraries
+Requires: %{name} = %{version}
+%description imf
+Ecore IMF functions
+%endif
+
 %package ipc
 Summary: Ecore inter-process communication functions
 Group: Development/Libraries
@@ -164,8 +175,9 @@ CFLAGS="-I/usr/kerberos/include -I/usr/X11R6/include/X11/extensions"
 LDFLAGS="-L/usr/kerberos/lib -L/usr/X11R6/%{_lib}"
 export CFLAGS LDFLAGS
 %{configure} --prefix=%{_prefix} \
-    %{?ac_with_lib_ecore_fb} \
     %{?ac_with_lib_ecore_directfb} \
+    %{?ac_with_lib_ecore_fb} \
+    %{?ac_with_lib_ecore_imf} \
     %{?ac_with_lib_ecore_sdl}
 
 %{__make} %{?_smp_mflags} %{?mflags}
@@ -229,6 +241,12 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_libdir}/libecore_file.so.*
 
+%if %{with lib_ecore_imf}
+%files imf
+%defattr(-, root, root)
+%{_libdir}/libecore_imf*.so.*
+%endif
+
 %files ipc
 %defattr(-, root, root)
 %{_libdir}/libecore_ipc.so.*

diff --git a/legacy/efreet/Makefile.am b/legacy/efreet/Makefile.am
index cdb401c..58d3c5e 100644 (file)
--- a/legacy/efreet/Makefile.am
+++ b/legacy/efreet/Makefile.am
@@ -8,4 +8,4 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        stamp-h.in depcomp efreet_doxy_warnings.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = efreet.pc efreet-mime.pc
+pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc

diff --git a/legacy/emotion/Makefile.am b/legacy/emotion/Makefile.am
index d4e2255..6d2fd00 100644 (file)
--- a/legacy/emotion/Makefile.am
+++ b/legacy/emotion/Makefile.am
@@ -16,8 +16,8 @@ EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
        emotion.spec emotion.spec.in emotion.c.in gendoc Doxyfile \
        emotion.pc.in debian/changelog debian/control \
        debian/copyright debian/rules debian/libemotion0.install \
-       debian/libemotion0-dev.install debian/emotion0-bin.install \
-       debian/libemotion0-gstreamer.install debian/libemotion0-xine.install
+       debian/libemotion-dev.install debian/libemotion-bin.install \
+       debian/libemotion-gstreamer.install debian/libemotion-xine.install
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = emotion.pc

diff --git a/legacy/emotion/emotion.spec.in b/legacy/emotion/emotion.spec.in
index a1f7a89..cc08edf 100644 (file)
--- a/legacy/emotion/emotion.spec.in
+++ b/legacy/emotion/emotion.spec.in
@@ -11,9 +11,9 @@ Source: ftp://ftp.enlightenment.org/pub/emotion/%{name}-%{version}.tar.gz
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-#BuildSuggests: xorg-x11-devel libxine1-devel xine-lib-devel
+#BuildSuggests: xorg-x11-devel XFree86-devel libX11-devel libxine1-devel xine-lib-devel
 #BuildSuggests: gstreamer-devel gstreamer-plugins-devel gstreamer-plugins-base-devel gstreamer-ffmpeg
-BuildRequires: XFree86-devel eet-devel evas-devel edje-devel edje-bin
+BuildRequires: eet-devel evas-devel edje-devel edje-bin
 BuildRequires: /usr/bin/xine-config
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -24,7 +24,7 @@ Emotion is a Media Library
 Summary: Emotion headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
-Requires: XFree86-devel
+Requires: eet-devel evas-devel edje-devel
 
 %description devel
 Headers, static libraries, test programs and documentation for Emotion
@@ -33,13 +33,16 @@ Headers, static libraries, test programs and documentation for Emotion
 %setup -q
 
 %build
-%{configure} --prefix=%{_prefix}
+%{configure} --prefix=%{_prefix} --enable-static --enable-shared
 %{__make} %{?_smp_mflags} %{?mflags}
 
 %install
 %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
 test -x `which doxygen` && sh gendoc || :
 
+# Remove useless static modules
+%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/*a
+
 %post
 /sbin/ldconfig || :
 
@@ -54,7 +57,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING* README
 %dir %{_libdir}/%{name}
 %{_bindir}/%{name}_*
-%{_libdir}/libemotion.a
 %{_libdir}/libemotion.so.*
 %{_libdir}/%{name}/*.so
 #%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.so
@@ -64,10 +66,9 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc doc/html
 %{_includedir}/*.h
-%{_libdir}/libemotion.so
+%{_libdir}/libemotion.a
 %{_libdir}/libemotion.la
-%{_libdir}/%{name}/*.a
-%{_libdir}/%{name}/*.la
+%{_libdir}/libemotion.so
 #%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.a
 #%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.la
 %{_libdir}/pkgconfig/%{name}.pc

diff --git a/legacy/evas/evas.spec.in b/legacy/evas/evas.spec.in
index 615a08f..828cbb5 100644 (file)
--- a/legacy/evas/evas.spec.in
+++ b/legacy/evas/evas.spec.in
@@ -30,6 +30,7 @@
 %bcond_without module_engine_software_x11
 %bcond_without module_engine_buffer
 %bcond_without module_engine_fb
+%bcond_without module_loader_pmaps
 %bcond_without module_loader_png
 %bcond_without module_saver_png
 %bcond_without module_loader_jpeg
@@ -47,6 +48,7 @@
 # Macros for ./configure use
 %define ac_with_module_loader_eet --%{?with_module_loader_eet:en}%{!?with_module_loader_eet:dis}able-image-loader-eet
 %define ac_with_module_loader_jpeg --%{?with_module_loader_jpeg:en}%{!?with_module_loader_jpeg:dis}able-image-loader-jpeg
+%define ac_with_module_loader_pmaps --%{?with_module_loader_pmaps:en}%{!?with_module_loader_pmaps:dis}able-image-loader-pmaps
 %define ac_with_module_loader_png --%{?with_module_loader_png:en}%{!?with_module_loader_png:dis}able-image-loader-png
 %define ac_with_module_loader_tiff --%{?with_module_loader_tiff:en}%{!?with_module_loader_tiff:dis}able-image-loader-tiff
 %define ac_with_module_loader_gif --%{?with_module_loader_gif:en}%{!?with_module_loader_gif:dis}able-image-loader-gif
@@ -135,6 +137,15 @@ BuildRequires: libjpeg-devel
 JPEG Image saver module for Evas
 %endif
 
+%if %{with module_loader_pmaps}
+%package module_loader_pmaps
+Summary: Pixmap Image loader module for Evas
+Group: System Environment/Libraries
+BuildRequires: libXpm-devel
+%description module_loader_pmaps
+Pixmap Image loader module for Evas
+%endif
+
 %if %{with module_loader_png}
 %package module_loader_png
 Summary: PNG Image loader module for Evas
@@ -340,6 +351,7 @@ Xrender XCB X11 rendering engine module for Evas
     %{?ac_with_module_saver_eet} \
     %{?ac_with_module_loader_jpeg} \
     %{?ac_with_module_saver_jpeg} \
+    %{?ac_with_module_loader_pmaps} \
     %{?ac_with_module_loader_png} \
     %{?ac_with_module_saver_png} \
     %{?ac_with_module_loader_tiff} \
@@ -405,6 +417,12 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evas/modules/savers/eet/*/module.so
 %endif
 
+%if %{with module_loader_pmaps}
+%files module_loader_pmaps
+%defattr(-, root, root)
+%{_libdir}/evas/modules/loaders/pmaps/*/module.so
+%endif
+
 %if %{with module_loader_png}
 %files module_loader_png
 %defattr(-, root, root)