E CVS: libs/imlib2 mej

[<enl...@li...>]

Enlightenment CVS committal

Author  : mej
Project : e17
Module  : libs/imlib2

Dir     : e17/libs/imlib2


Modified Files:
	autogen.sh configure.ac configure.in imlib2.spec 


Log Message:
Wed May 29 09:22:42 2002                        Michael Jennings (mej)

Merged changes from SPLIT into the main trunk and deleted SPLIT.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/autogen.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- autogen.sh	8 Apr 2002 21:10:12 -0000	1.12
+++ autogen.sh	29 May 2002 13:23:15 -0000	1.13
@@ -24,12 +24,18 @@
 cd "$srcdir"
 DIE=0
 
+SUBDIRS="libltdl ."
+
 set -x
-aclocal || abort "aclocal"
-libtoolize --ltdl --force --copy || abort "libtoolize"
-autoheader || abort "autoheader"
-automake --foreign --add-missing || abort "automake"
-autoconf || abort "autoconf"
+
+for EACHDIR in $SUBDIRS ; do
+    cd $THEDIR/$EACHDIR
+    aclocal || abort "aclocal"
+    libtoolize --ltdl --force --copy || abort "libtoolize"
+    autoheader || abort "autoheader"
+    automake --foreign --add-missing || abort "automake"
+    autoconf || abort "autoconf"
+done
 
 if test -z "$*"; then
         echo "I am going to run ./configure with no arguments - if you wish "
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- configure.ac	19 Apr 2002 15:37:21 -0000	1.10
+++ configure.ac	29 May 2002 13:23:15 -0000	1.11
@@ -3,7 +3,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([src/Imlib2.h])
 AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE(imlib2, 1.0.5)
+AM_INIT_AUTOMAKE(imlib2, 1.0.6)
 
 AM_CONFIG_HEADER(config.h)
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- configure.in	8 Apr 2002 21:49:11 -0000	1.55
+++ configure.in	29 May 2002 13:23:17 -0000	1.56
@@ -2,7 +2,7 @@
 
 AC_INIT(src/Imlib2.h)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(imlib2, 1.0.5)
+AM_INIT_AUTOMAKE(imlib2, 1.0.6)
 
 AM_CONFIG_HEADER(config.h)
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- imlib2.spec	15 Jan 2002 20:23:53 -0000	1.12
+++ imlib2.spec	29 May 2002 13:23:17 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Powerful image loading and rendering library
 Name: imlib2
-Version: 1.0.5
-Release: 1
+Version: 1.0.6
+Release: 3
 Copyright: BSD
 Group: System Environment/Libraries
 Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz
@@ -12,6 +12,9 @@
 BuildRequires: libpng-devel
 BuildRequires: XFree86-devel
 BuildRequires: freetype-devel
+Requires: %{name}-loader_jpeg = %{version}
+Requires: %{name}-loader_png = %{version}
+Requires: %{name}-loader_argb = %{version}
 
 %description
 Imlib2 is an advanced replacement library for libraries like libXpm that
@@ -91,6 +94,12 @@
 %description loader_xpm
 XPM image loader/saver for Imlib2
 
+%package loader_gzbz2
+Summary: Imlib2 .gz/.bz2 loader
+Group: System Environment/Libraries
+%description loader_gzbz2
+Gzip/Bzip2 compressed image loader/saver for Imlib2
+
 %prep
 rm -rf $RPM_BUILD_ROOT
 
@@ -174,6 +183,9 @@
 
 %files loader_xpm
 %attr(755,root,root) %{_libdir}/loaders/image/xpm.*
+
+%files loader_gzbz2
+%attr(755,root,root) %{_libdir}/loaders/image/gzbz2.*
 
 %changelog
 * Mon Jan 8 2001 The Rasterman <ra...@ra...>