Enlightenment CVS committal

Author  : mej
Project : e17
Module  : libs/emotion

Dir     : e17/libs/emotion


Modified Files:
        Makefile.am configure.in emotion.spec 


Log Message:
Sun Jul 25 17:45:53 2004                        Michael Jennings (mej)

Fixed up lots of spec files here.  I haven't been able to test the
emotion spec file, but hopefully I didn't break anything too
terrible. :-)

Also fixed an etox problem with the conditional test build.
----------------------------------------------------------------------

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 15 Jul 2004 19:23:03 -0000      1.2
+++ Makefile.am 25 Jul 2004 21:50:38 -0000      1.3
@@ -10,7 +10,7 @@
 
 bin_SCRIPTS = emotion-config
 
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN emotion.spec emotion.c.in gendoc 
Doxyfile emotion_docs.tar.gz emotion.pc.in
+EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN emotion.spec emotion.c.in gendoc 
Doxyfile emotion.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = emotion.pc
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- configure.in        24 Jul 2004 09:53:00 -0000      1.5
+++ configure.in        25 Jul 2004 21:50:38 -0000      1.6
@@ -63,7 +63,7 @@
     AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Install Location for 
Executables])
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}". [Install Location for Executables])
+  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Install Location for Executables])
 fi
 
 dnl Set PACKAGE_LIB_DIR in config.h.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/emotion.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion.spec        22 Jul 2004 23:00:58 -0000      1.4
+++ emotion.spec        25 Jul 2004 21:50:38 -0000      1.5
@@ -1,27 +1,18 @@
-# Note that this is NOT a relocatable package
-%define ver      0.0.1
-%define rel      1
-%define prefix   /usr
+%define _missing_doc_files_terminate_build 0
 
 Summary: emotion
 Name: emotion
-Version: %ver
-Release: %rel
+Version: 0.0.1
+Release: 1.%(date '+%Y%m%d')
 Copyright: BSD
 Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/emotion/emotion-%{ver}.tar.gz
-BuildRoot: /var/tmp/emotion-root
-Packager: The Rasterman <[EMAIL PROTECTED]>
 URL: http://www.enlightenment.org/
-BuildRequires: libjpeg-devel
-BuildRequires: zlib-devel
-Requires: libjpeg
-Requires: zlib
-
-Docdir: %{prefix}/doc
+Source: ftp://ftp.enlightenment.org/pub/emotion/%{name}-%{version}.tar.gz
+Packager: Michael Jennings <[EMAIL PROTECTED]>
+#BuildSuggests: xorg-x11-devel xine-lib-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-
 Emotion is a Media Library
 
 %package devel
@@ -30,62 +21,49 @@
 Requires: %{name} = %{version}
 
 %description devel
-Headers, static libraries, test programs and documentation for Eet
+Headers, static libraries, test programs and documentation for Emotion
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 
 %build
-./configure --prefix=%prefix
-
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make
-else
-  make
-fi
-###########################################################################
+%{configure} --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} %{?mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
+test -x `which doxygen` && sh gendoc || :
 
 %post
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun
-/sbin/ldconfig
+/sbin/ldconfig || :
+
+%clean
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%attr(755,root,root) %{prefix}/lib/libemotion.a
-%attr(755,root,root) %{prefix}/lib/libemotion.so.*
-%attr(755,root,root) %{prefix}/bin/emotion_*
-%attr(755,root,root) %{prefix}/lib/emotion/emotion_decoder_xine.a
-%attr(755,root,root) %{prefix}/lib/xine/plugins/1.0.0/xineplug_vo_out_emotion.a
+%defattr(-, root, root)
+%doc AUTHORS COPYING* README
+%{_libdir}/libemotion.a
+%{_libdir}/libemotion.so.*
+%{_bindir}/emotion_*
+%{_libdir}/emotion/emotion_decoder_xine.a
+%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.a
 %{_datadir}/emotion
-%doc AUTHORS
-%doc COPYING
-%doc README
 
 %files devel
-%attr(755,root,root) %{prefix}/bin/emotion-config
-%attr(755,root,root) %{prefix}/lib/pkgconfig/emotion.pc
-%attr(755,root,root) %{prefix}/lib/libemotion.so
-%attr(755,root,root) %{prefix}/lib/libemotion.la
-%attr(755,root,root) %{prefix}/lib/emotion/emotion_decoder_xine.la
-%attr(755,root,root) %{prefix}/lib/emotion/emotion_decoder_xine.so
-%attr(755,root,root) %{prefix}/lib/xine/plugins/1.0.0/xineplug_vo_out_emotion.so
-%attr(755,root,root) %{prefix}/lib/xine/plugins/1.0.0/xineplug_vo_out_emotion.la
-%{prefix}/include/Emotion*
-%doc emotion_docs.tar.gz
+%defattr(-, root, root)
+%doc doc/html
+%{_bindir}/emotion-config
+%{_libdir}/pkgconfig/emotion.pc
+%{_libdir}/libemotion.so
+%{_libdir}/libemotion.la
+%{_libdir}/emotion/emotion_decoder_xine.la
+%{_libdir}/emotion/emotion_decoder_xine.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.so
+%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.la
+%{_includedir}/Emotion*
 
 %changelog
-* Fri Jun 18 2004 Azundris <[EMAIL PROTECTED]>
-- Added missing files
-* Sat Jun 23 2001 The Rasterman <[EMAIL PROTECTED]>
-- Created spec file                                            




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to