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

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

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/emotion@35187 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index d4e2255..6d2fd00 100644 (file)
--- a/Makefile.am
+++ b/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/emotion.spec.in b/emotion.spec.in
index a1f7a89..cc08edf 100644 (file)
--- a/emotion.spec.in
+++ b/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