diff -upk.orig libmng-1.0.9.orig/libmng_types.h libmng-1.0.9/libmng_types.h

--- libmng-1.0.9.orig/libmng_types.h	2005-01-30 10:45:04 +0000

+++ libmng-1.0.9/libmng_types.h	2005-05-24 11:13:04 +0000

@@ -173,7 +173,7 @@

 #ifndef ZLIB_DLL

 #undef FAR

 #endif

-#include <lcms.h>

+#include <lcms/lcms.h>

 #endif /* MNG_INCLUDE_LCMS */

 #ifdef MNG_INCLUDE_IJG6B               /* IJG's jpgsrc6b */

diff -upk.orig libmng-1.0.9.orig/makefiles/Makefile.am libmng-1.0.9/makefiles/Makefile.am

--- libmng-1.0.9.orig/makefiles/Makefile.am	2005-01-30 10:50:34 +0000

+++ libmng-1.0.9/makefiles/Makefile.am	2005-05-24 11:13:55 +0000

@@ -7,7 +7,7 @@ EXTRA_DIST = makefiles doc contrib

 # libmng release @VERSION@

-libmng_la_LDFLAGS = -version-info 1:0:0

+libmng_la_LDFLAGS = -version-info 1:9:0

 lib_LTLIBRARIES = libmng.la

diff -upk.orig libmng-1.0.9.orig/makefiles/configure.in libmng-1.0.9/makefiles/configure.in

--- libmng-1.0.9.orig/makefiles/configure.in	2005-01-30 10:50:34 +0000

+++ libmng-1.0.9/makefiles/configure.in	2005-05-24 11:13:33 +0000

@@ -168,7 +168,7 @@ AC_ARG_WITH(lcms,

   fi

   if test "x$with_lcms" != "xno"; then

-    AC_CHECK_HEADER(lcms.h, [

+    AC_CHECK_HEADER(lcms/lcms.h, [

       have_lcms=yes

       AC_CHECK_LIB(lcms, cmsCreateRGBProfile, [

         LIBS="$LIBS -llcms"

diff -upk.orig libmng-1.0.9.orig/makefiles/makefile.linux libmng-1.0.9/makefiles/makefile.linux

--- libmng-1.0.9.orig/makefiles/makefile.linux	2005-01-30 10:50:34 +0000

+++ libmng-1.0.9/makefiles/makefile.linux	2005-05-24 11:14:59 +0000

@@ -19,20 +19,20 @@ prefix=/usr/local

 # Where the zlib library and include files are located

 #ZLIBLIB=../zlib

 #ZLIBINC=../zlib

-ZLIBLIB=/usr/local/lib

-ZLIBINC=/usr/local/include

+ZLIBLIB=/usr/lib

+ZLIBINC=/usr/include

 # Where the jpeg library and include files are located

 #JPEGLIB=../jpgsrc

 #JPEGINC=../jpgsrc

-JPEGLIB=/usr/local/lib

-JPEGINC=/usr/local/include

+JPEGLIB=/usr/lib

+JPEGINC=/usr/include

 # Where the lcms library and include files are located

 #LCMSLIB=../lcms/lib

 #LCMSINC=../lcms/source

-LCMSLIB=/usr/local/lib

-LCMSINC=/usr/local/include

+LCMSLIB=/usr/lib

+LCMSINC=/usr/include

 ALIGN=

 # for i386:

@@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith

 # for pgcc version 2.95.1, -O3 is buggy; don't use it.

-CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \

+CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) $(RPM_OPT_FLAGS) \

 	$(OPTIONS) $(ALIGN) # $(WARNMORE) -g

 LDFLAGS=-L. -Wl,-rpath,. \

 	-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \