rpms/imlib/devel imlib-1.9.15-gmodulehack.patch, NONE, 1.1 imlib-1.9.15-lib-bloat.patch, NONE, 1.1 imlib-1.9.15-multilib-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 imlib.spec, 1.4, 1.5 sources, 1.2, 1.3 imlib-1.9.10-ac25.patch, 1.1, NONE imlib-1.9.13-gmodulehack.patch, 1.1, NONE imlib-1.9.13-waitpid.patch, 1.1, NONE imlib-1.9.14-bounds.patch, 1.1, NONE

Paul Howarth (pghmcfc) fedora-extras-commits at redhat.com
Tue Apr 3 09:51:35 UTC 2007


Author: pghmcfc

Update of /cvs/extras/rpms/imlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5931

Modified Files:
	.cvsignore imlib.spec sources 
Added Files:
	imlib-1.9.15-gmodulehack.patch imlib-1.9.15-lib-bloat.patch 
	imlib-1.9.15-multilib-config.patch 
Removed Files:
	imlib-1.9.10-ac25.patch imlib-1.9.13-gmodulehack.patch 
	imlib-1.9.13-waitpid.patch imlib-1.9.14-bounds.patch 
Log Message:
* Sat Jan 20 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-1
- update to 1.9.15
- update gmodulehack patch
- update URL
- version the obsoletes and provides
- require giflib-devel instead of libungif-devel
- remove redundant gtk+ dependency
- devel package requires %{_datadir}/aclocal and pkgconfig
- remove patches for fixes done upstream (ac25, waitpid, bounds)
- use sed rather than perl for scripted edits
- macro-ize commands where possible, hardcode paths otherwise
- use make with DESTDIR rather than %makeinstall
- use more explicit names in the %files lists
- make imlib-config multilib-compatible
- add buildreq libXt-devel (needed for FC5)


imlib-1.9.15-gmodulehack.patch:

--- NEW FILE imlib-1.9.15-gmodulehack.patch ---
--- imlib-1.9.15/gdk_imlib/Makefile.am.	2007-03-27 14:59:33.000000000 +0100
+++ imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 14:58:42.000000000 +0100
@@ -87,7 +87,7 @@
 
 
 libgdk_imlib_la_LDFLAGS = -version-info 10:15:9
-libgdk_imlib_la_LIBADD = $(GX_LIBS)
+libgdk_imlib_la_LIBADD = $(GX_LIBS) local-hack-gmodule/libgmodule-local.la
 
 
 include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
--- imlib-1.9.15/configure.in	2007-03-27 15:01:15.000000000 +0100
+++ imlib-1.9.15/configure.in	2007-03-27 15:02:59.000000000 +0100
@@ -32,56 +32,12 @@
 	fi
 ])
 
-dynworks=false
-if test x$with_modules = xno; then
-	AC_MSG_RESULT(no)
-else 
-	AC_MSG_RESULT(yes)
-
-if test "x$GDK_IMLIB" != x; then
-  oLIBS="$LIBS"
-  oCFLAGS="$CFLAGS"
-  LIBS="$LIBS `glib-config --libs gmodule`"
-  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-  AC_TRY_RUN([
-#include <glib.h>
-#include <gmodule.h>
-main ()
-{
-    if (g_module_supported ())
-        exit (0);
-    else
-        exit (1);
-}
-], dynworks=true)
-  LIBS="$oLIBS"
-  CFLAGS="$oCFLAGS"
-fi
-
-dnl Now we check to see if our libtool supports shared lib deps
-dnl (in a rather ugly way even)
-builddir=`pwd`
-if $dynworks; then
-   imlib_libtool_config="$builddir/libtool --config"
-   imlib_deplibs_check=`$imlib_libtool_config | \
-      grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-      sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-   if test "x$imlib_deplibs_check" = "xnone" || \
-      test "x$imlib_deplibs_check" = "xunknown" || \
-      test "x$imlib_deplibs_check" = "x"; then
-      dynworks=false
-   fi
-fi
-
-if $dynworks; then
-   AC_DEFINE(USE_GMODULE, 1, [ ])
-   GMODULE_LIBS="`glib-config --libs gmodule`"
-   GMODULE_FLAGS="`glib-config --cflags gmodule`"
-   AC_SUBST(GMODULE_LIBS)
-   AC_SUBST(GMODULE_FLAGS)
-fi
-
-fi
+dynworks=true
+GMODULE_LIBS=
+GMODULE_CFLAGS=
+AC_DEFINE(USE_GMODULE, 1, [ ])
+AC_SUBST(GMODULE_LIBS)
+AC_SUBST(GMODULE_CFLAGS)
 
 AC_SUBST(TIFFLIBS)
 AC_SUBST(GIFLIBS)

imlib-1.9.15-lib-bloat.patch:

--- NEW FILE imlib-1.9.15-lib-bloat.patch ---
--- imlib-1.9.15/configure.in	2007-03-27 15:02:59.000000000 +0100
+++ imlib-1.9.15/configure.in	2007-03-27 16:18:49.000000000 +0100
@@ -204,16 +204,12 @@
 
 
 AC_CHECK_HEADER(gif_lib.h,
-  [AC_CHECK_LIB(ungif, DGifOpenFileName,
-    [GIFLIBS="-lungif"
-     SUPPORT_LIBS="$SUPPORT_LIBS -lungif"; AC_DEFINE(HAVE_LIBGIF, 1, [ ])],
     [AC_CHECK_LIB(gif, DGifOpenFileName,
       [GIFLIBS="-lgif"
       SUPPORT_LIBS="$SUPPORT_LIBS -lgif"
        AC_DEFINE(HAVE_LIBGIF, 1, [ ])],
       [AC_MSG_ERROR(*** GIF library file not found ***)], 
       $GX_LIBS)],
-    $GX_LIBS)],
   [AC_MSG_ERROR(*** GIF header not found ***)])
 
 AC_CHECK_LIB(png, png_read_info,
@@ -237,9 +237,9 @@
 fi
 
 if test "$png_ok" = yes; then
-	PNGLIBS="-lpng -lz"
+	PNGLIBS="-lpng"
 	AC_SUBST(HAVE_LIBPNG)
-	SUPPORT_LIBS="$SUPPORT_LIBS -lpng -lz"; AC_DEFINE(HAVE_LIBPNG, 1, [ ])
+	SUPPORT_LIBS="$SUPPORT_LIBS -lpng"; AC_DEFINE(HAVE_LIBPNG, 1, [ ])
 fi
 
 SUPPORT_LIBS="$SUPPORT_LIBS -lm"
--- imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:17.000000000 +0100
+++ imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:46.000000000 +0100
@@ -32,8 +32,7 @@
 
 libImlib_la_LDFLAGS    = -version-info 11:0:0
 #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
-libImlib_la_LIBADD     = $(SUPPORT_LIBS) $(X_PRE_LIBS) \
-			 $(X_LIBS) $(X_EXTRA_LIBS)
+libImlib_la_LIBADD     = $(SUPPORT_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
 
 DEFS =  -DSYSTEM_IMRC=\"$(sysconfdir)/imrc\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
--- imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:45:24.000000000 +0100
+++ imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:48:05.000000000 +0100
@@ -20,11 +20,11 @@
 
 libimlib_tiff_la_SOURCES = io-tiff.c
 libimlib_tiff_la_LDFLAGS = $(common_ldflags)
-libimlib_tiff_la_LIBADD  = $(TIFFLIBS) libgdk_imlib.la
+libimlib_tiff_la_LIBADD  = $(TIFFLIBS)
 
 libimlib_ps_la_SOURCES = io-ps.c
 libimlib_ps_la_LDFLAGS = $(common_ldflags)
-libimlib_ps_la_LIBADD = libgdk_imlib.la
+libimlib_ps_la_LIBADD =
 
 libimlib_bmp_la_SOURCES = io-bmp.c
 libimlib_bmp_la_LDFLAGS = $(common_ldflags)
@@ -32,7 +32,7 @@
 
 libimlib_xpm_la_SOURCES = io-xpm.c
 libimlib_xpm_la_LDFLAGS = $(common_ldflags)
-libimlib_xpm_la_LIBADD = libgdk_imlib.la
+libimlib_xpm_la_LIBADD = -lgdk_imlib -lX11
 
 libimlib_ppm_la_SOURCES = io-ppm.c
 libimlib_ppm_la_LDFLAGS = $(common_ldflags)

imlib-1.9.15-multilib-config.patch:

--- NEW FILE imlib-1.9.15-multilib-config.patch ---
--- imlib-1.9.15/imlib-config.in.multilib	2004-08-27 17:03:11.000000000 +0100
+++ imlib-1.9.15/imlib-config.in	2007-03-29 11:07:08.000000000 +0100
@@ -58,12 +58,10 @@
       echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+      echo -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
       ;;
     --libs-gdk)
-      libdirs=-L at libdir@
-      echo $libdirs -lgdk_imlib$gdk_gx_libs `@GTK_CONFIG@ --libs` $gdk_libs
+      echo -lgdk_imlib$gdk_gx_libs `@GTK_CONFIG@ --libs` $gdk_libs
       ;;
     *)
       echo "${usage}" 1>&2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 23:05:07 -0000	1.2
+++ .cvsignore	3 Apr 2007 09:51:01 -0000	1.3
@@ -1,2 +1,2 @@
-imlib-1.9.13.tar.gz
+imlib-1.9.15.tar.bz2
 local-hack-gmodule.tar.gz


Index: imlib.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imlib.spec	12 Jan 2007 12:49:44 -0000	1.4
+++ imlib.spec	3 Apr 2007 09:51:01 -0000	1.5
@@ -1,59 +1,54 @@
-%define __libtoolize echo
+%define libtool_hack LIBTOOL=/usr/bin/libtool
 
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
-Version:	1.9.13
-Release:	31%{?dist}
+Version:	1.9.15
+Release:	1%{?dist}
 Epoch:		1
 License:	LGPL
 Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/Libraries/Imlib.html
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-%{version}.tar.gz
+URL:		http://www.enlightenment.org/Libraries/Imlib/
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-%{version}.tar.bz2
 Source2:	local-hack-gmodule.tar.gz
-
-Patch2:		imlib-1.9.10-ac25.patch
 Patch3:		imlib-1.9.10-cppflags.patch
-Patch4:		imlib-1.9.13-gmodulehack.patch
-# Bug fixes from 1.9.14
-Patch5:		imlib-1.9.13-waitpid.patch
+Patch4:		imlib-1.9.15-gmodulehack.patch
 Patch6:		imlib-1.9.13-underquoted.patch
-Patch7:		imlib-1.9.14-bounds.patch
-
+Patch8:		imlib-1.9.15-lib-bloat.patch
+Patch9:		imlib-1.9.15-multilib-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
-Requires:	gtk+ >= 1:1.2
-
+BuildRequires:	automake
+BuildRequires:	giflib-devel
+BuildRequires:	gtk+-devel
 BuildRequires:	libpng-devel >= 1.2.2
-BuildRequires:	libtiff-devel, libjpeg-devel
-BuildRequires:	zlib-devel, gtk+-devel
-BuildRequires:	libungif-devel, libX11-devel
-BuildRequires:	automake14, libtool, autoconf
-
-Obsoletes:	imlib-cfgeditor, Imlib
-Provides:	imlib-cfgeditor, Imlib
+BuildRequires:	libjpeg-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libtool
+BuildRequires:	libX11-devel
+BuildRequires:	libXt-devel
+BuildRequires:	zlib-devel
+Obsoletes:	imlib-cfgeditor <= %{version}-%{release}, Imlib <= %{version}-%{release}
+Provides:	imlib-cfgeditor = %{version}-%{release}, Imlib = %{version}-%{release}
 
 %description
-Imlib is a display depth independent image loading and rendering
-library. Imlib is designed to simplify and speed up the process of
-loading images and obtaining X Window System drawables. Imlib
-provides many simple manipulation routines which can be used for
-common operations.
-
-The imlib package also contains the imlib_config program, which
-you can use to configure the Imlib image loading and rendering
-library. Imlib_config can be used to control how Imlib uses color and
-handles gamma corrections, etc.
+Imlib is a display depth independent image loading and rendering library.
+Imlib is designed to simplify and speed up the process of loading images and
+obtaining X Window System drawables. Imlib provides many simple manipulation
+routines which can be used for common operations.
+
+The imlib package also contains the imlib_config program, which you can use to
+configure the Imlib image loading and rendering library. Imlib_config can be
+used to control how Imlib uses color and handles gamma corrections, etc.
 
-Install imlib if you need an image loading and rendering library for
-X11R6, or if you are installing GNOME. 
+Install imlib if you need an image loading and rendering library for X11R6, or
+if you are installing GNOME. 
 
 %package devel
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
 Requires:	imlib = %{epoch}:%{version}-%{release}
-Requires:	libtiff-devel, libjpeg-devel
-Requires:	zlib-devel, gtk+-devel
-Requires:	libungif-devel, libX11-devel
+Requires:	giflib-devel, gtk+-devel, libjpeg-devel, libtiff-devel
+Requires:	libX11-devel, zlib-devel
+Requires:	%{_datadir}/aclocal, pkgconfig
 
 %description devel
 The header files, static libraries and documentation needed for
@@ -65,71 +60,108 @@
 
 %prep
 %setup -q
-
-%patch2 -p1 -b .ac25
 %patch3 -p1 -b .cppflags
 %patch4 -p1 -b .gmodulehack
-%patch5 -p1 -b .waitpid
 %patch6 -p1 -b .underquoted
-%patch7 -p1 -b .bounds
-
-(cd gdk_imlib && tar zxf %{SOURCE2})
+%patch8 -p1 -b .lib-bloat
+%patch9 -p1 -b .multilib
 
-perl -p -i.bak -e 's/gmodule.h/gmodule-local.h/g; s/g_module/local_hack_g_module/g; s/GModule/LocalHackGModule/g; s/G_MODULE/LOCAL_HACK_G_MODULE/g' gdk_imlib/modules.c
-perl -pi -e 's/-static//g' gdk_imlib/local-hack-gmodule/Makefile
+## Local gmodule hack to support building with libpng rather than libpng10
+(cd gdk_imlib && %{__tar} zxf %{SOURCE2})
+%{__sed} -i -e	's/gmodule.h/gmodule-local.h/g;
+		 s/g_module/local_hack_g_module/g;
+		 s/GModule/LocalHackGModule/g;
+		 s/G_MODULE/LOCAL_HACK_G_MODULE/g' \
+	gdk_imlib/modules.c
+%{__sed} -i -e 's/-static//g' \
+	gdk_imlib/local-hack-gmodule/Makefile
 
 ## Change soname to reflect new libpng
-perl -pi -e 's/10:14:9/11:0:0/g' Imlib/Makefile*
-perl -pi -e 's/10:13:9/11:0:0/g' Imlib/Makefile*
+%{__sed} -i -e 's/10:15:9/11:0:0/g' Imlib/Makefile*
 
 %build
-autoreconf -i -f
-
+/usr/bin/autoreconf -i -f
 %configure
 
-export tagname=CC
-pushd gdk_imlib/local-hack-gmodule
-make LIBTOOL=/usr/bin/libtool
-cp gmodule-local.h ..
-popd
+## Remove -L%{_libdir} from imlib-config if present;
+## it's redundant and breaks multilib compatibility
+%{__sed} -i -e 's,-L%{_libdir} ,,g' imlib-config
+
+## Build local gmodule hack
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule %{libtool_hack}
+%{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
 
-make LIBTOOL=/usr/bin/libtool ## %{?_smp_mflags}
+## Avoid unnecessary library linkage in libgdk_imlib
+GX_LIBS=$(/usr/bin/gtk-config --libs | %{__sed} -e 's/-lgtk //; s/-lgmodule //; s/-lXi //')
 
-###########################################################################
+## Note: build with %{?_smp_mflags} doesn't work reliably
+%{__make} %{libtool_hack} GX_LIBS="${GX_LIBS}"
 
 %install
-rm -rf %{buildroot}
-%makeinstall LIBTOOL=/usr/bin/libtool
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot} %{libtool_hack}
 
-rm -f %{buildroot}%{_libdir}/*a
+## Don't package static or libtool archives
+%{__rm} -f %{buildroot}%{_libdir}/*a
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README AUTHORS ChangeLog COPYING.LIB
-%attr(755,root,root) %{_libdir}/lib*.so.*
-%config(noreplace) %{_sysconfdir}/*
-%{_libdir}/libimlib-*.so
+%config(noreplace) %{_sysconfdir}/im_palette-small.pal
+%config(noreplace) %{_sysconfdir}/im_palette-tiny.pal
+%config(noreplace) %{_sysconfdir}/im_palette.pal
+%config(noreplace) %{_sysconfdir}/imrc
 %{_bindir}/imlib_config
+%{_libdir}/libImlib.so.11
+%{_libdir}/libImlib.so.11.*
+%{_libdir}/libgdk_imlib.so.1
+%{_libdir}/libgdk_imlib.so.1.*
+%{_libdir}/libimlib-bmp.so
+%{_libdir}/libimlib-gif.so
+%{_libdir}/libimlib-jpeg.so
+%{_libdir}/libimlib-png.so
+%{_libdir}/libimlib-ppm.so
+%{_libdir}/libimlib-ps.so
+%{_libdir}/libimlib-tiff.so
+%{_libdir}/libimlib-xpm.so
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*.gif doc/*.html
 %{_bindir}/imlib-config
+%{_datadir}/aclocal/imlib.m4
+%{_includedir}/*.h
 %{_libdir}/libImlib.so
 %{_libdir}/libgdk_imlib.so
-%{_includedir}/*
-%{_datadir}/aclocal/*
-%{_libdir}/pkgconfig/*
-%{_datadir}/man/man*/*
+%{_libdir}/pkgconfig/imlib.pc
+%{_libdir}/pkgconfig/imlibgdk.pc
+%{_mandir}/man1/imlib_config.1*
+%{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Sat Jan 20 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-1
+- update to 1.9.15
+- update gmodulehack patch
+- update URL
+- version the obsoletes and provides
+- require giflib-devel instead of libungif-devel
+- remove redundant gtk+ dependency
+- devel package requires %%{_datadir}/aclocal and pkgconfig
+- remove patches for fixes done upstream (ac25, waitpid, bounds)
+- use sed rather than perl for scripted edits
+- macro-ize commands where possible, hardcode paths otherwise
+- use make with DESTDIR rather than %%makeinstall
+- use more explicit names in the %%files lists
+- make imlib-config multilib-compatible
+- add buildreq libXt-devel (needed for FC5)
+
 * Fri Jan 12 2007 Paul Howarth <paul at city-fan.org> 1:1.9.13-31
 - rebuilt
 
@@ -291,7 +323,7 @@
 - up to 1.8.1
 
 * Tue Sep 22 1998 Cristian Gafton <gafton at redhat.com>
-- yet another build for today (%defattr and %attr in the files lists)
+- yet another build for today (%%defattr and %%attr in the files lists)
 - devel docs are back on the spec file
 
 * Tue Sep 22 1998 Carsten Haitzler <raster at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 23:05:07 -0000	1.2
+++ sources	3 Apr 2007 09:51:01 -0000	1.3
@@ -1,2 +1,2 @@
-8ab3f6ea596f731d54c18385bcc3525f  imlib-1.9.13.tar.gz
+7db987e6c52e4daf70d7d0f471238eae  imlib-1.9.15.tar.bz2
 1fe64ee91e1c8bb0a207d17101ec10b2  local-hack-gmodule.tar.gz


--- imlib-1.9.10-ac25.patch DELETED ---


--- imlib-1.9.13-gmodulehack.patch DELETED ---


--- imlib-1.9.13-waitpid.patch DELETED ---


--- imlib-1.9.14-bounds.patch DELETED ---




More information about the scm-commits mailing list