From 2815e3efc164054f257ca86e7e814864dc7521e5 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Sun, 25 Jul 2004 21:50:40 +0000 Subject: [PATCH] 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. ---------------------------------------------------------------------- SVN revision: 11021 --- legacy/ecore/ecore.spec | 11 +++-- legacy/edje/edje.spec | 6 ++- legacy/eet/eet.spec | 14 +++--- legacy/embryo/embryo.spec | 6 ++- legacy/emotion/Makefile.am | 2 +- legacy/emotion/configure.in | 2 +- legacy/emotion/emotion.spec | 92 ++++++++++++++----------------------- legacy/evas/evas.spec | 12 ++--- 8 files changed, 62 insertions(+), 83 deletions(-) diff --git a/legacy/ecore/ecore.spec b/legacy/ecore/ecore.spec index 1e77ac0f6b..f857ca0df2 100644 --- a/legacy/ecore/ecore.spec +++ b/legacy/ecore/ecore.spec @@ -1,14 +1,15 @@ +%define _missing_doc_files_terminate_build 0 + Summary: Enlightened Core X interface library Name: ecore Version: 1.0.0 -Release: 0.pre7 +Release: 0.pre7.%(date '+%Y%m%d') Copyright: BSD Group: User Interface/X Source: ftp://ftp.enlightenment.org/enlightenment/%{name}-%{version}_pre7.tar.gz URL: http://www.enlightenment.org/efm.html Packager: Michael Jennings -Vendor: The Enlightenment Development Team -#BuildSuggests: openssl-devel +#BuildSuggests: openssl-devel evas-devel xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -37,10 +38,10 @@ Ecore development files 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 diff --git a/legacy/edje/edje.spec b/legacy/edje/edje.spec index 52a333478a..0df563e5f5 100644 --- a/legacy/edje/edje.spec +++ b/legacy/edje/edje.spec @@ -1,13 +1,15 @@ +%define _missing_doc_files_terminate_build 0 + Summary: Complex Graphical Design/Layout Engine Name: edje Version: 0.5.0 -Release: 1 +Release: 1.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries Source: ftp://ftp.enlightenment.org/pub/evoak/%{name}-%{version}.tar.gz Packager: The Rasterman URL: http://www.enlightenment.org/ -BuildRequires: libjpeg-devel zlib-devel +#BuildSuggests: libjpeg-devel zlib-devel eet-devel xorg-x11-devel Requires: libjpeg zlib ecore evas eet imlib2 BuildRoot: %{_tmppath}/%{name}-%{version}-root diff --git a/legacy/eet/eet.spec b/legacy/eet/eet.spec index 2e32bc0a92..0cd1838080 100644 --- a/legacy/eet/eet.spec +++ b/legacy/eet/eet.spec @@ -1,17 +1,15 @@ -# Note that this is NOT a relocatable package -%define ver 0.9.9 -%define rel 1 -%define prefix /usr +%define _missing_doc_files_terminate_build 0 Summary: Library for speedy data storage, retrieval, and compression. Name: eet Version: 0.9.9 -Release: 2 +Release: 2.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries Source: ftp://ftp.enlightenment.org/pub/eet/eet-%{version}.tar.gz Packager: Michael Jennings URL: http://www.enlightenment.org/ +#BuildSuggests: libjpeg-devel xorg-x11-devel doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -19,12 +17,12 @@ Eet is a tiny library designed to write an arbitary set of chunks of data to a file and optionally compress each chunk (very much like a zip file) and allow fast random-access reading of the file later on. It does not do zip as a zip itself has more complexity than is -needed, and it was much simpler to impliment this once here. +needed, and it was much simpler to implement this once here. It also can encode and decode data structures in memory, as well as image data for saving to eet files or sending across the network to other machines, or just writing to arbitary files on the system. All -data is encoded ina platform independant way and can be written and +data is encoded in a platform independant way and can be written and read by any architecture. %package devel @@ -41,7 +39,7 @@ Headers, static libraries, test programs and documentation for Eet %build %{configure} --prefix=%{_prefix} %{__make} %{?_smp_mflags} %{?mflags} -test -x `which doxygen` && doxygen || : +test -x `which doxygen` && sh gendoc || : %install %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install diff --git a/legacy/embryo/embryo.spec b/legacy/embryo/embryo.spec index e66315b134..58d3abbe19 100644 --- a/legacy/embryo/embryo.spec +++ b/legacy/embryo/embryo.spec @@ -1,7 +1,9 @@ +%define _missing_doc_files_terminate_build 0 + Summary: embryo Name: embryo -Version: 0.0.1 -Release: 1 +Version: 0.9.0 +Release: 1.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/ diff --git a/legacy/emotion/Makefile.am b/legacy/emotion/Makefile.am index d32617db01..4e7d09a0c7 100644 --- a/legacy/emotion/Makefile.am +++ b/legacy/emotion/Makefile.am @@ -10,7 +10,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ 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 diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in index 8e6c2b717a..8a53d21364 100644 --- a/legacy/emotion/configure.in +++ b/legacy/emotion/configure.in @@ -63,7 +63,7 @@ if test "x${bindir}" = 'xNONE'; then 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. diff --git a/legacy/emotion/emotion.spec b/legacy/emotion/emotion.spec index 68545eb615..45f61eb3e1 100644 --- a/legacy/emotion/emotion.spec +++ b/legacy/emotion/emotion.spec @@ -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 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 +#BuildSuggests: xorg-x11-devel xine-lib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description - Emotion is a Media Library %package devel @@ -30,62 +21,49 @@ Group: System Environment/Libraries 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 -- Added missing files -* Sat Jun 23 2001 The Rasterman -- Created spec file diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec index 928be0a2a8..f5d418ccc3 100644 --- a/legacy/evas/evas.spec +++ b/legacy/evas/evas.spec @@ -1,19 +1,17 @@ +%define _missing_doc_files_terminate_build 0 + Summary: Multi-platform Canvas Library Name: evas Version: 1.0.0 -Release: 0.pre13 +Release: 0.pre13.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries Source: ftp://ftp.enlightenment.org/pub/evas/evas-%{version}_pre13.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Packager: Michael Jennings URL: http://www.enlightenment.org/ -#BuildSuggests: XFree86-devel -#BuildSuggests: freetype2-devel -#BuildSuggests: libjpeg-devel -#BuildSuggests: libpng-devel -#BuildSuggests: eet-devel -#BuildSuggests: edb-devel +#BuildSuggests: XFree86-devel freetype2-devel libjpeg-devel +#BuildSuggests: libpng-devel eet-devel edb-devel xorg-x11-devel Provides: evas evas_software_x11 evas_loader_png evas_loader_jpeg evas_loader_eet evas_loader_edb %description