From 00aeaf458636210016b20200ab193602343fd01e Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 12 Sep 2000 21:11:22 +0000 Subject: [PATCH] up version number.. tentative for a 1.0 release... revamp rpm packages completely. split loaders into their own packages (more logical units). main imlib2 requires the jpeg, png and db laoders at a minimum SVN revision: 3417 --- TODO | 1 - configure.in | 2 +- imlib2.spec.in | 196 ++++++++++++++++++++++++++++-------------------- src/Makefile.am | 2 +- 4 files changed, 116 insertions(+), 85 deletions(-) diff --git a/TODO b/TODO index 46b48b5..e69de29 100644 --- a/TODO +++ b/TODO @@ -1 +0,0 @@ -* fix loaders to only build if libs are present diff --git a/configure.in b/configure.in index 4882593..26a2e48 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ if test x$mmx = xyes; then AC_DEFINE(DO_MMX_ASM, 1, [enabling MMX Assembly]) fi -AM_INIT_AUTOMAKE(imlib2, 0.0.5) +AM_INIT_AUTOMAKE(imlib2, 1.0.0) pkglibdir='${libdir}'/loaders AC_SUBST(pkglibdir) diff --git a/imlib2.spec.in b/imlib2.spec.in index 515f121..003e655 100644 --- a/imlib2.spec.in +++ b/imlib2.spec.in @@ -1,23 +1,27 @@ -# Note that this is NOT a relocatable package %define ver @VERSION@ -%define rel 2 +%define rel 1 %define prefix @prefix@ -Summary: Powerful image loading and rendering library for X11R6 +Summary: Powerful image loading and rendering library Name: imlib2 Version: %ver Release: %rel -Copyright: LGPL -Group: X11/Libraries -Source: ftp://ftp.enlightenment.org/pub/enlightenment/libs/imlib2-%{ver}.tar.gz -BuildRoot: /var/tmp/imlib-root -Packager: Term +Copyright: BSD +Group: System Environment/Libraries +Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/imlib2-%{ver}.tar.gz +BuildRoot: /var/tmp/imlib2-root +Packager: The Rasterman URL: http://www.rasterman.com/raster/imlib.html Requires: freetype >= 1.2 -Requires: libpng Requires: libjpeg +Requires: libpng +Requires: edb Requires: zlib - +Requires: XFree86 +Requires: imlib2-loader_jpeg +Requires: imlib2-loader_png +Requires: imlib2-loader_db +Requires: imlib2-loader_argb Docdir: %{prefix}/doc %description @@ -28,65 +32,92 @@ rendering and blending, dynamic binary filters, scripting, and more. %package devel Summary: Imlib2 headers, static libraries and documentation -Group: X11/Libraries +Group: System Environment/Libraries Requires: imlib2 = %{PACKAGE_VERSION} %description devel Headers, static libraries and documentation for Imlib2. -#### dont build demos -#%package demos -#Summary: Imlib2 demo programs -#Group: X11/Libraries -#Requires: imlib2 = %{PACKAGE_VERSION} -# -#%description demos -#Demonstration viewer and other programs. +%package loader_jpeg +Summary: Imlib2 JPEG loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +Requires: libjpeg +%description loader_jpeg +JPEG image loader/saver for Imlib2 + +%package loader_png +Summary: Imlib2 PNG loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +Requires: libpng +Requires: zlib +%description loader_png +PNG image loader/saver for Imlib2 + +%package loader_db +Summary: Imlib2 DB loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +Requires: edb +%description loader_db +DB image loader/saver for Imlib2 + +%package loader_argb +Summary: Imlib2 ARGB loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +%description loader_argb +ARGB image loader/saver for Imlib2 + +%package loader_bmp +Summary: Imlib2 BMP loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +%description loader_bmp +BMP image loader/saver for Imlib2 + +%package loader_gif +Summary: Imlib2 GIF loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +%description loader_gif +GIF image loader/saver for Imlib2 + +%package loader_pnm +Summary: Imlib2 PNM loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +%description loader_pnm +PNM image loader/saver for Imlib2 + +%package loader_tga +Summary: Imlib2 TGA loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +%description loader_tga +TGA image loader/saver for Imlib2 + +%package loader_tiff +Summary: Imlib2 TIFF loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +Requires: libtiff +%description loader_tiff +TIFF image loader/saver for Imlib2 + +%package loader_xpm +Summary: Imlib2 XPM loader +Group: System Environment/Libraries +Requires: imlib2 = %{PACKAGE_VERSION} +%description loader_xpm +XPM image loader/saver for Imlib2 %prep %setup -cd demo -sed Makefile.am1 -mv -f Makefile.am1 Makefile.am -sed Makefile.am1 -mv -f Makefile.am1 Makefile.am %build -##### Boring normal rpm build method -# old method of building - does not auto-detect for options in OPT_FLAGS -########################################################################### -#CFLAGS="${RPM_OPT_FLAGS}" ./configure --prefix=%prefix -#make -########################################################################### - -##### High-perfromance auto-detect -# Needed for snapshot releases. -# Optimize that damned code all the way -########################################################################### -#if [ ! -z "echo -n ${RPM_OPT_FLAGS} | grep pentium" ]; then -# if [ -z "${CC}" -a ! -z "`which egcs`" ]; then -# CC="egcs" -# export CC -# else -# if [ -z "${CC}" -a ! -z "`which pgcc`" ]; then -# CC="pgcc" -# export CC -# fi -# fi -# CFLAGS="${RPM_OPT_FLAGS}" -#else -# CFLAGS="${RPM_OPT_FLAGS}" -#fi -#export CFLAGS -# -if [ ! -f configure ]; then - sed autogen.sh1 - mv -f autogen.sh1 autogen.sh - chmod 0700 autogen.sh - ./autogen.sh --prefix=%prefix -else - ./configure --prefix=%prefix -fi +./configure --prefix=%prefix if [ "$SMP" != "" ]; then (make "MAKE=make -k -j $SMP"; exit 0) @@ -95,18 +126,9 @@ else make fi -## added to make the viewer -cd demo -make -#mv imlib2_view imlib2-view -########################################################################### - %install rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT%{prefix} install -mkdir -p $RPM_BUILD_ROOT%{prefix}/bin -cd demo -cp imlib2_view $RPM_BUILD_ROOT%{prefix}/bin %clean rm -rf $RPM_BUILD_ROOT @@ -117,28 +139,38 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README COPYING ChangeLog TODO doc/* +%doc README COPYING ChangeLog doc/* %attr(755,root,root) %{prefix}/lib/lib*.so.* -%attr(755,root,root) %{prefix}/lib/loaders %{prefix}/bin/* %files devel %defattr(-,root,root) %{prefix}/lib/libImlib2.so -%{prefix}/lib/*a +%{prefix}/lib/*.a %{prefix}/include/* -#%files demos -#%defattr(-,root,root) +%files loader_jpeg +%attr(755,root,root) %{prefix}/lib/loaders/image/jpeg.* +%files loader_png +%attr(755,root,root) %{prefix}/lib/loaders/image/png.* +%files loader_db +%attr(755,root,root) %{prefix}/lib/loaders/image/db.* +%files loader_argb +%attr(755,root,root) %{prefix}/lib/loaders/image/argb.* +%files loader_bmp +%attr(755,root,root) %{prefix}/lib/loaders/image/bmp.* +%files loader_gif +%attr(755,root,root) %{prefix}/lib/loaders/image/gif.* +%files loader_pnm +%attr(755,root,root) %{prefix}/lib/loaders/image/pnm.* +%files loader_tga +%attr(755,root,root) %{prefix}/lib/loaders/image/tga.* +%files loader_tiff +%attr(755,root,root) %{prefix}/lib/loaders/image/tiff.* +%files loader_xpm +%attr(755,root,root) %{prefix}/lib/loaders/image/xpm.* %changelog -* Wed Aug 30 2000 Lyle Kempler -- Include imlib2-config - -* Sat May 20 2000 Lyle Kempler -- Fixed problems with requiring imlib2_view -- Went back to imlib2_view (not imlib2-view) - -* Tue Nov 2 1999 Lyle Kempler -- Mangled imlib 1.9.8 imlib spec file into imlib2 spec file +* Tue Sep 12 2000 The Rasterman +- Redo spec file diff --git a/src/Makefile.am b/src/Makefile.am index c3fd1b2..e4c1692 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ libImlib2_la_SOURCES = rend.c ximage.c scale.c rgba.c image.c color.c grab.c \ libImlib2_la_LIBADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ -lX11 -lXext -lttf $(LDFLAGS) libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h -libImlib2_la_LDFLAGS = -version-info 0:5:0 +libImlib2_la_LDFLAGS = -version-info 1:0:0 SYS_LOADERS_PATH = @pkglibdir@ image.lo: loaderpath.h