rpms/imlib/devel imlib-1.9.10-ac25.patch, NONE, 1.1 imlib-1.9.10-cppflags.patch, NONE, 1.1 imlib-1.9.13-gmodulehack.patch, NONE, 1.1 imlib-1.9.13-underquoted.patch, NONE, 1.1 imlib-1.9.13-waitpid.patch, NONE, 1.1 imlib-1.9.14-bounds.patch, NONE, 1.1 imlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael J Knox (mjk)
fedora-extras-commits at redhat.com
Mon Jul 3 23:05:07 UTC 2006
Author: mjk
Update of /cvs/extras/rpms/imlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4624/devel
Modified Files:
.cvsignore sources
Added Files:
imlib-1.9.10-ac25.patch imlib-1.9.10-cppflags.patch
imlib-1.9.13-gmodulehack.patch imlib-1.9.13-underquoted.patch
imlib-1.9.13-waitpid.patch imlib-1.9.14-bounds.patch
imlib.spec
Log Message:
auto-import imlib-1.9.13-28 on branch devel from imlib-1.9.13-28.src.rpm
import from Core into Extras
imlib-1.9.10-ac25.patch:
--- NEW FILE imlib-1.9.10-ac25.patch ---
--- imlib-1.9.10/configure.in.ac25 Tue Mar 27 23:10:41 2001
+++ imlib-1.9.10/configure.in Thu Feb 7 17:06:56 2002
@@ -249,21 +249,21 @@
dnl Test for libtiff
AC_CHECK_LIB(tiff, TIFFReadScanline,
- AC_CHECK_HEADER(tiffio.h,
+ [ AC_CHECK_HEADER(tiffio.h,
TIFFLIBS="-ltiff"
SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; AC_DEFINE(HAVE_LIBTIFF),
- AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)),
- AC_CHECK_LIB(tiff, TIFFWriteScanline,
- AC_CHECK_HEADER(tiffio.h,
+ AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)) ],
+ [ AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ [ AC_CHECK_HEADER(tiffio.h,
TIFFLIBS="-ltiff -ljpeg -lz"
SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF),
- AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)),
- AC_CHECK_LIB(tiff34, TIFFFlushData,
- AC_CHECK_HEADER(tiffio.h,
+ AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)) ],
+ [ AC_CHECK_LIB(tiff34, TIFFFlushData,
+ [ AC_CHECK_HEADER(tiffio.h,
TIFFLIBS="-ltiff34 -ljpeg -lz"
SUPPORT_LIBS="$SUPPORT_LIBS -ltiff34 -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF),
- AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)),
- AC_MSG_WARN(*** Native TIFF support will not be built (TIFF library not found) ***), -ljpeg -lz $GX_LIBS), -ljpeg -lz $GX_LIBS), $GX_LIBS)
+ AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)) ],
+ AC_MSG_WARN(*** Native TIFF support will not be built (TIFF library not found) ***), -ljpeg -lz $GX_LIBS) ], -ljpeg -lz $GX_LIBS) ], $GX_LIBS)
AC_CHECK_HEADER(gif_lib.h,
@@ -281,9 +281,9 @@
AC_MSG_WARN(*** Native GIF support will not be built (GIF header not found) ***))
AC_CHECK_LIB(png, png_read_info,
- AC_CHECK_HEADER(png.h,
+ [ AC_CHECK_HEADER(png.h,
png_ok=yes,
- png_ok=no),
+ png_ok=no) ],
AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), -lz -lm $GX_LIBS)
if test "$png_ok" = yes; then
AC_MSG_CHECKING([for png_structp in png.h])
imlib-1.9.10-cppflags.patch:
--- NEW FILE imlib-1.9.10-cppflags.patch ---
--- imlib-1.9.10/configure.in.cppflags Tue Jan 8 15:05:58 2002
+++ imlib-1.9.10/configure.in Tue Jan 8 15:06:11 2002
@@ -160,8 +160,6 @@
GX_LIBS="$GTK_LIBS"
fi
-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
-
SUPPORT_LIBS=""
dnl Test for shared memory headers and semantics, unless we are
imlib-1.9.13-gmodulehack.patch:
--- NEW FILE imlib-1.9.13-gmodulehack.patch ---
--- imlib-1.9.13/gdk_imlib/Makefile.am.gmodulehack Wed Mar 13 13:02:39 2002
+++ imlib-1.9.13/gdk_imlib/Makefile.am Thu Mar 14 12:20:10 2002
@@ -83,7 +83,7 @@
libgdk_imlib_la_LDFLAGS = -version-info 10:13:9
libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(X_PRE_LIBS) \
- $(X_LIBS) $(X_EXTRA_LIBS)
+ $(X_LIBS) $(X_EXTRA_LIBS) local-hack-gmodule/libgmodule-local.la
include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
--- imlib-1.9.13/configure.in.gmodulehack Thu Mar 14 12:16:52 2002
+++ imlib-1.9.13/configure.in Thu Mar 14 12:16:52 2002
@@ -32,55 +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)
-if $dynworks; then
- imlib_libtool_config="$srcdir/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)
- 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)
+AC_SUBST(GMODULE_LIBS)
+AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(TIFFLIBS)
AC_SUBST(GIFLIBS)
imlib-1.9.13-underquoted.patch:
--- NEW FILE imlib-1.9.13-underquoted.patch ---
--- imlib-1.9.13/imlib.m4.underquoted 2004-08-06 13:46:53.184070437 +0100
+++ imlib-1.9.13/imlib.m4 2004-08-06 13:47:08.596126926 +0100
@@ -6,7 +6,7 @@
dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
dnl
-AC_DEFUN(AM_PATH_IMLIB,
+AC_DEFUN([AM_PATH_IMLIB],
[dnl
dnl Get the cflags and libraries from the imlib-config script
dnl
@@ -164,7 +164,7 @@
])
# Check for gdk-imlib
-AC_DEFUN(AM_PATH_GDK_IMLIB,
+AC_DEFUN([AM_PATH_GDK_IMLIB],
[dnl
dnl Get the cflags and libraries from the imlib-config script
dnl
imlib-1.9.13-waitpid.patch:
--- NEW FILE imlib-1.9.13-waitpid.patch ---
--- imlib-1.9.13/gdk_imlib/load.c.waitpid Wed Apr 10 17:43:34 2002
+++ imlib-1.9.13/gdk_imlib/load.c Wed Apr 10 17:43:38 2002
@@ -302,11 +302,11 @@
break;
}
}
-#if 0
if (p && !needs_conv) {
if (p != stdin)
fclose(p);
}
+#if 0
else if (p)
_gdk_imlib_close_helper(p);
--- imlib-1.9.13/Imlib/load.c.waitpid Wed Apr 10 17:41:46 2002
+++ imlib-1.9.13/Imlib/load.c Wed Apr 10 17:42:12 2002
@@ -1823,9 +1823,9 @@
if (p != stdin)
fclose(p);
}
+#if 0
else if (p)
close_helper(p);
-#if 0
/* This is *all* fallback code. Prone to badness. Turn it OFF */
if ((!data) && (id->fallback))
{
imlib-1.9.14-bounds.patch:
--- NEW FILE imlib-1.9.14-bounds.patch ---
diff -uprk.orig imlib-1.9.14.orig/gdk_imlib/io-bmp.c imlib-1.9.14/gdk_imlib/io-bmp.c
--- imlib-1.9.14.orig/gdk_imlib/io-bmp.c 2002-03-04 20:06:29 +0300
+++ imlib-1.9.14/gdk_imlib/io-bmp.c 2004-08-30 13:38:02 +0400
@@ -42,12 +42,12 @@ loader_bmp (FILE *file, int *w, int *h,
fread(dbuf, 4, 2, file);
*w = (int)dbuf[0];
*h = (int)dbuf[1];
- if (*w > 32767)
+ if ((*w < 0) || (*w > 32767))
{
fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
return NULL;
}
- if (*h > 32767)
+ if ((*h < 0) || (*h > 32767))
{
fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
return NULL;
@@ -72,6 +72,9 @@ loader_bmp (FILE *file, int *w, int *h,
ncolors = (int)dbuf[0];
if (ncolors == 0)
ncolors = 1 << bpp;
+ if ((ncolors < 0) || (ncolors > (1 << bpp)))
+ ncolors = 1 << bpp;
+
/* some more sanity checks */
if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
{
@@ -197,9 +200,13 @@ loader_bmp (FILE *file, int *w, int *h,
for (bit = 0; bit < 8; bit++)
{
index = ((byte & (0x80 >> bit)) ? 1 : 0);
- ptr[poffset] = cmap[index].r;
- ptr[poffset + 1] = cmap[index].g;
- ptr[poffset + 2] = cmap[index].b;
+ /* possibly corrupted file? */
+ if (index < ncolors && poffset < *w * *h * 3)
+ {
+ ptr[poffset] = cmap[index].r;
+ ptr[poffset + 1] = cmap[index].g;
+ ptr[poffset + 2] = cmap[index].b;
+ }
column++;
}
}
@@ -221,9 +228,13 @@ loader_bmp (FILE *file, int *w, int *h,
index = ((byte & (0xF0 >> nibble * 4)) >> (!nibble * 4));
if (index >= 16)
index = 15;
- ptr[poffset] = cmap[index].r;
- ptr[poffset + 1] = cmap[index].g;
- ptr[poffset + 2] = cmap[index].b;
+ /* possibly corrupted file? */
+ if (index < ncolors && poffset < *w * *h * 3)
+ {
+ ptr[poffset] = cmap[index].r;
+ ptr[poffset + 1] = cmap[index].g;
+ ptr[poffset + 2] = cmap[index].b;
+ }
column++;
}
}
@@ -263,9 +274,13 @@ loader_bmp (FILE *file, int *w, int *h,
{
linepos++;
byte = getc(file);
- ptr[poffset] = cmap[byte].r;
- ptr[poffset + 1] = cmap[byte].g;
- ptr[poffset + 2] = cmap[byte].b;
+ /* possibly corrupted file? */
+ if (byte < ncolors && poffset < *w * *h * 3)
+ {
+ ptr[poffset] = cmap[byte].r;
+ ptr[poffset + 1] = cmap[byte].g;
+ ptr[poffset + 2] = cmap[byte].b;
+ }
column++;
}
if (absolute & 0x01)
@@ -276,9 +291,13 @@ loader_bmp (FILE *file, int *w, int *h,
{
for (i = 0; i < first; i++)
{
- ptr[poffset] = cmap[byte].r;
- ptr[poffset + 1] = cmap[byte].g;
- ptr[poffset + 2] = cmap[byte].b;
+ /* possibly corrupted file? */
+ if (byte < ncolors && poffset < *w * *h * 3)
+ {
+ ptr[poffset] = cmap[byte].r;
+ ptr[poffset + 1] = cmap[byte].g;
+ ptr[poffset + 2] = cmap[byte].b;
+ }
column++;
linepos++;
}
@@ -286,9 +305,13 @@ loader_bmp (FILE *file, int *w, int *h,
}
else
{
- ptr[poffset] = cmap[byte].r;
- ptr[poffset + 1] = cmap[byte].g;
- ptr[poffset + 2] = cmap[byte].b;
+ /* possibly corrupted file? */
+ if (byte < ncolors && poffset < *w * *h * 3)
+ {
+ ptr[poffset] = cmap[byte].r;
+ ptr[poffset + 1] = cmap[byte].g;
+ ptr[poffset + 2] = cmap[byte].b;
+ }
column++;
linepos += size;
}
@@ -297,9 +320,13 @@ loader_bmp (FILE *file, int *w, int *h,
else if (bpp == 24)
{
linepos += fread(&bbuf, 1, 3, file);
- ptr[poffset] = (unsigned char)bbuf[2];
- ptr[poffset + 1] = (unsigned char)bbuf[1];
- ptr[poffset + 2] = (unsigned char)bbuf[0];
+ /* possibly corrupted file? */
+ if (poffset < *w * *h * 3)
+ {
+ ptr[poffset] = (unsigned char)bbuf[2];
+ ptr[poffset + 1] = (unsigned char)bbuf[1];
+ ptr[poffset + 2] = (unsigned char)bbuf[0];
+ }
column++;
}
else if (bpp == 16)
@@ -307,12 +334,16 @@ loader_bmp (FILE *file, int *w, int *h,
unsigned char temp;
linepos += fread(&word, 2, 1, file);
- temp = (word & rmask) >> rshift;
- ptr[poffset] = temp;
- temp = (word & gmask) >> gshift;
- ptr[poffset + 1] = temp;
- temp = (word & bmask) >> gshift;
- ptr[poffset + 2] = temp;
+ /* possibly corrupted file? */
+ if (poffset < *w * *h * 3)
+ {
+ temp = (word & rmask) >> rshift;
+ ptr[poffset] = temp;
+ temp = (word & gmask) >> gshift;
+ ptr[poffset + 1] = temp;
+ temp = (word & bmask) >> gshift;
+ ptr[poffset + 2] = temp;
+ }
column++;
}
else
@@ -320,12 +351,16 @@ loader_bmp (FILE *file, int *w, int *h,
unsigned char temp;
linepos += fread(&dword, 4, 1, file);
- temp = (dword & rmask) >> rshift;
- ptr[poffset] = temp;
- temp = (dword & gmask) >> gshift;
- ptr[poffset + 1] = temp;
- temp = (dword & bmask) >> bshift;
- ptr[poffset + 2] = temp;
+ /* possibly corrupted file? */
+ if (poffset < *w * *h * 3)
+ {
+ temp = (dword & rmask) >> rshift;
+ ptr[poffset] = temp;
+ temp = (dword & gmask) >> gshift;
+ ptr[poffset + 1] = temp;
+ temp = (dword & bmask) >> bshift;
+ ptr[poffset + 2] = temp;
+ }
column++;
}
}
--- imlib-1.9.10/Imlib/load.c.xx 2004-09-02 10:17:48.738898822 +0200
+++ imlib-1.9.10/Imlib/load.c 2004-09-02 10:18:32.698181227 +0200
@@ -631,12 +631,12 @@
fread(dbuf, 4, 2, file);
*w = (int)dbuf[0];
*h = (int)dbuf[1];
- if (*w > 32767)
+ if ((*w < 0) || (*w > 32767))
{
fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
return NULL;
}
- if (*h > 32767)
+ if ((*h < 0) || (*h > 32767))
{
fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
return NULL;
@@ -661,6 +661,9 @@
ncolors = (int)dbuf[0];
if (ncolors == 0)
ncolors = 1 << bpp;
+ if ((ncolors < 0) || (ncolors > (1 << bpp)))
+ ncolors = 1 << bpp;
+
/* some more sanity checks */
if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
{
@@ -786,9 +789,13 @@
for (bit = 0; bit < 8; bit++)
{
index = ((byte & (0x80 >> bit)) ? 1 : 0);
+ /* possibly corrupted file? */
+ if (index < ncolors && poffset < *w * *h * 3)
+ {
ptr[poffset] = cmap[index].r;
ptr[poffset + 1] = cmap[index].g;
ptr[poffset + 2] = cmap[index].b;
+ }
column++;
}
}
@@ -810,9 +817,13 @@
index = ((byte & (0xF0 >> nibble * 4)) >> (!nibble * 4));
if (index >= 16)
index = 15;
+ /* possibly corrupted file? */
+ if (index < ncolors && poffset < *w * *h * 3)
+ {
ptr[poffset] = cmap[index].r;
ptr[poffset + 1] = cmap[index].g;
ptr[poffset + 2] = cmap[index].b;
+ }
column++;
}
}
@@ -851,9 +862,13 @@
{
linepos++;
byte = getc(file);
+ /* possibly corrupted file? */
+ if (byte < ncolors && poffset < *w * *h * 3)
+ {
ptr[poffset] = cmap[byte].r;
ptr[poffset + 1] = cmap[byte].g;
ptr[poffset + 2] = cmap[byte].b;
+ }
column++;
}
if (absolute & 0x01)
@@ -864,9 +879,13 @@
{
for (i = 0; i < first; i++)
{
+ /* possibly corrupted file? */
+ if (byte < ncolors && poffset < *w * *h * 3)
+ {
ptr[poffset] = cmap[byte].r;
ptr[poffset + 1] = cmap[byte].g;
ptr[poffset + 2] = cmap[byte].b;
+ }
column++;
linepos++;
}
@@ -874,9 +893,13 @@
}
else
{
+ /* possibly corrupted file? */
+ if (byte < ncolors && poffset < *w * *h * 3)
+ {
ptr[poffset] = cmap[byte].r;
ptr[poffset + 1] = cmap[byte].g;
ptr[poffset + 2] = cmap[byte].b;
+ }
column++;
}
}
@@ -884,9 +907,12 @@
else if (bpp == 24)
{
linepos += fread(bbuf, 1, 3, file);
+ if (poffset< *w * *h * 3)
+ {
ptr[poffset] = (unsigned char)bbuf[2];
ptr[poffset + 1] = (unsigned char)bbuf[1];
ptr[poffset + 2] = (unsigned char)bbuf[0];
+ }
column++;
}
else if (bpp == 16)
@@ -894,12 +920,16 @@
unsigned char temp;
linepos += fread(&word, 2, 1, file);
+ /* possibly corrupted file? */
+ if (poffset < *w * *h * 3)
+ {
temp = (word & rmask) >> rshift;
ptr[poffset] = temp;
temp = (word & gmask) >> gshift;
ptr[poffset + 1] = temp;
temp = (word & bmask) >> gshift;
ptr[poffset + 2] = temp;
+ }
column++;
}
else
@@ -907,12 +937,16 @@
unsigned char temp;
linepos += fread(&dword, 4, 1, file);
+ /* possibly corrupted file? */
+ if (poffset < *w * *h * 3)
+ {
temp = (dword & rmask) >> rshift;
ptr[poffset] = temp;
temp = (dword & gmask) >> gshift;
ptr[poffset + 1] = temp;
temp = (dword & bmask) >> bshift;
ptr[poffset + 2] = temp;
+ }
column++;
}
}
--- NEW FILE imlib.spec ---
%define __libtoolize echo
Summary: An image loading and rendering library for X11R6
Name: imlib
Version: 1.9.13
Release: 28%{?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
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
Patch6: imlib-1.9.13-underquoted.patch
Patch7: imlib-1.9.14-bounds.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gtk+ >= 1:1.2
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
%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.
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
%description devel
The header files, static libraries and documentation needed for
developing Imlib applications. Imlib is an image loading and
rendering library for X11R6.
Install the imlib-devel package if you want to develop Imlib
applications. You will also need to install the imlib package.
%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})
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
## 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*
%build
libtoolize --copy --force
aclocal-1.4
automake-1.4
autoconf
%configure
export tagname=CC
pushd gdk_imlib/local-hack-gmodule
make LIBTOOL=/usr/bin/libtool
cp gmodule-local.h ..
popd
make LIBTOOL=/usr/bin/libtool ## %{?_smp_mflags}
###########################################################################
%install
rm -rf %{buildroot}
%makeinstall LIBTOOL=/usr/bin/libtool
rm -f %{buildroot}%{_libdir}/*a
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog COPYING.LIB
%attr(755,root,root) %{_libdir}/lib*.so.*
%config(noreplace) %{_sysconfdir}/*
%{_libdir}/libimlib-*.so
%{_bindir}/imlib_config
%files devel
%defattr(-,root,root)
%doc doc/*.gif doc/*.html
%{_bindir}/imlib-config
%{_libdir}/libImlib.so
%{_libdir}/libgdk_imlib.so
%{_includedir}/*
%{_datadir}/aclocal/*
%{_libdir}/pkgconfig/*
%{_datadir}/man/man*/*
%changelog
* Thu Jun 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1:1.9.13-28
- spec tidy for FE import
* Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:1.9.13-27
- Package review cleanups
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.9.13-26.2.1
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.9.13-26.2
- rebuilt for new gcc4.1 snapshot and glibc changes
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
* Mon Nov 7 2005 Matthias Clasen <mclasen at redhat.com> 1:1.9.13-26
- Remove static libs from the -devel package
* Tue Nov 1 2005 Matthias Clasen <mclasen at redhat.com> 1:1.9.13-25
- Switch requires to modular X
* Wed Mar 2 2005 Matthias Clasen <mclasen at redhat.com> 1:1.9.13-24
- Replace Copyright: with License:
- rebuild with gcc4
* Thu Sep 9 2004 Matthias Clasen <mclasen at redhat.com>
- security fixes
* Thu Aug 12 2004 Matthias Clasen <mclasen at redhat.com> 1:1.9.13-18
- Kill imlib-cfgeditor subpackage. Move imlib_config
into imlib package. (#127878)
* Fri Aug 6 2004 Tim Waugh <twaugh at redhat.com> 1:1.9.13-17
- Fixed underquoted m4 definitions.
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Aug 6 2003 Elliot Lee <sopwith at redhat.com>
- Fix libtool
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Jun 3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.
* Fri Jan 24 2003 Jonathan Blandford <jrb at redhat.com>
- add epoch to requires, #77919
- Fix URI, #71008
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Tue Nov 5 2002 Jeremy Katz <katzj at redhat.com>
- rebuild to fixup Xlib dir in .pc file
* Tue Aug 13 2002 Havoc Pennington <hp at redhat.com>
- bump soname for new libpng, matches Debian soname
- mop up unpackaged files
* Fri Jul 19 2002 Jakub Jelinek <jakub at redhat.com>
- really remove -static
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Mon Jun 17 2002 Havoc Pennington <hp at redhat.com>
- remove -static that messed up prelinking
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Mon May 13 2002 Jeremy Katz <katzj at redhat.com>
- rebuild in new environment
* Wed Apr 10 2002 Owen Taylor <otaylor at redhat.com>
- Backport file descriptor leak and extra waitpid fixes from 1.9.14
* Fri Mar 15 2002 Owen Taylor <otaylor at redhat.com>
- Remove netpbm dependencies
* Thu Mar 14 2002 Owen Taylor <otaylor at redhat.com>
- Version 1.9.13
- Bump version for 6.x/7.x split
- Remove automake-1.4 references
* Thu Feb 28 2002 Havoc Pennington <hp at redhat.com>
- backport to Hampton
* Thu Feb 7 2002 Havoc Pennington <hp at redhat.com>
- remove libpng10, instead load libpng without RTLD_GLOBAL in
gdk_imlib, and break ABI of plain Imlib
* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Tue Jan 8 2002 Havoc Pennington <hp at redhat.com>
- get rid of -I/usr/include that was hosing up the png build
* Mon Jan 7 2002 Havoc Pennington <hp at redhat.com>
- try to build against libpng10
- minor spec file cleanup
* Mon Jun 18 2001 Than Ngo <than at redhat.com>
- use %%{_tmppath}
- fix to build against new libtool
* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
- Updated to new version (1.9.10)
* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release
* Tue Aug 01 2000 Jonathan Blandford <jrb at redhat.com>
- updated to new version.
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Thu Jun 29 2000 Dave Mason <dcm at redhat.com>
- updated spec file to new RPM Guidelines
* Sat Jun 3 2000 Nalin Dahyabhai <nalin at redhat.com>
- change dependencies from libgr to netpbm
* Wed May 31 2000 Matt Wilson <msw at redhat.com>
- use makeinstall macro
- 1.9.8
* Fri Feb 25 2000 Elliot Lee <sopwith at redhat.com>
- Patch to use fallback locations for palette files.
* Thu Feb 03 2000 Preston Brown <pbrown at redhat.com>
- strip format plugins
* Tue Aug 31 1999 Elliot Lee <sopwith at redhat.com>
- Updates from the RHL 6.0 package.
* Mon Jan 11 1999 Carsten Haitzler <raster at redhat.com>
- up to 1.9.0
* Wed Sep 23 1998 Carsten Haitzler <raster at redhat.com>
- 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)
- devel docs are back on the spec file
* Tue Sep 22 1998 Carsten Haitzler <raster at redhat.com>
- Added minor patch for ps saving code.
* Mon Sep 21 1998 Cristian Gafton <gafton at redhat.com>
- updated to version 1.8
* Fri Sep 11 1998 Cristian Gafton <gafton at redhat.com>
- take out imlib_config from devel package
* Wed Sep 9 1998 Michael Fulbright <msf at redhat.com>
- upgraded to 1.7
- changed name so it will persist if user later install devel imlib
- added subpackage for imlib_config
* Fri Apr 3 1998 Michael K. Johnson <johnsonm at redhat.com>
- fixed typo
* Fri Mar 13 1998 Marc Ewing <marc at redhat.com>
- Added -k, Obsoletes
- Integrate into CVS source tree
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Jul 2006 23:03:46 -0000 1.1
+++ .cvsignore 3 Jul 2006 23:05:07 -0000 1.2
@@ -0,0 +1,2 @@
+imlib-1.9.13.tar.gz
+local-hack-gmodule.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Jul 2006 23:03:46 -0000 1.1
+++ sources 3 Jul 2006 23:05:07 -0000 1.2
@@ -0,0 +1,2 @@
+8ab3f6ea596f731d54c18385bcc3525f imlib-1.9.13.tar.gz
+1fe64ee91e1c8bb0a207d17101ec10b2 local-hack-gmodule.tar.gz
More information about the fedora-extras-commits
mailing list