Enlightenment CVS committal
Author : mej
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
Makefile.am emotion.spec.in
Log Message:
Wed Jul 23 00:10:13 2008 Michael Jennings (mej)
distcheck and spec fixes
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/e17/libs/emotion/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 25 Jan 2008 04:40:28 -0000 1.13
+++ Makefile.am 23 Jul 2008 07:11:55 -0000 1.14
@@ -16,8 +16,8 @@
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
===================================================================
RCS file: /cvs/e/e17/libs/emotion/emotion.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- emotion.spec.in 7 Nov 2007 05:42:07 -0000 1.9
+++ emotion.spec.in 23 Jul 2008 07:11:55 -0000 1.10
@@ -11,9 +11,9 @@
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
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 @@
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 @@
%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 @@
%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 @@
%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
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
