- qt3 patch is obsolete

- fixed --tag (CC, not CXX) and added --mode in makefiles patch

Changed files:
    lcms-makefiles.patch -> 1.5
    lcms.spec -> 1.13

diff --git a/lcms-makefiles.patch b/lcms-makefiles.patch
index f2487ac81d73cb6258415a6029cc92e05e973d0b..dd8898e8c63d87d9e44f4e266f34d30b15faf037 100644 (file)
--- a/lcms-makefiles.patch
+++ b/lcms-makefiles.patch
@@ -23,7 +23,7 @@
        -cp icctrans $(BINDIR)
 --- lcms-1.09/src/makefile     Mon Jun 17 14:29:45 2002
 +++ lcms-1.09.new/src/makefile Sat Mar  1 13:36:14 2003
-@@ -1,23 +1,23 @@
+@@ -1,50 +1,43 @@
  SHELL = /bin/sh
  
 -CFLAGS  = -g -O4 -I../include -fomit-frame-pointer -Wall
@@ -42,7 +42,7 @@
 -.c.o: 
 -      $(CC) $(CFLAGS) -c $<
 +%.lo: %.c     
-+      $(LIBTOOL) --tag CXX $(CC) $(CFLAGS) -c $<
++      $(LIBTOOL) --mode=compile --tag CC $(CC) $(CFLAGS) -c $<
  
  SRCS = cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
        cmslut.c cmsmatsh.c cmsmtrx.c cmspack.c cmspcs.c cmswtpnt.c \
@@ -53,7 +53,11 @@
  
  
  
-@@ -28,23 +28,16 @@
+-all:  liblcms.a liblcms.so.${VERSION} 
++all:  liblcms.la
+ 
+ 
+ #
  # Library
  #
  
@@ -66,7 +70,7 @@
 -      -ln -s liblcms.so.${VERSION} liblcms.so.1
 -      -ln -s liblcms.so.1 liblcms.so
 +liblcms.la: $(OBJS)
-+      $(LIBTOOL) --tag CXX $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm
++      $(LIBTOOL) --mode=link --tag CC $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm
  
  #
  # Installation
@@ -77,7 +81,7 @@
        mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
 -      -cp -a liblcms.so* $(LIBDIR)
 -      cp -a liblcms.a $(LIBDIR)
-+      $(LIBTOOL) install liblcms.la $(LIBDIR)
++      $(LIBTOOL) --mode=install install liblcms.la $(LIBDIR)
        cp ../include/lcms.h ../include/icc34.h $(INCDIR)
  
  #

diff --git a/lcms.spec b/lcms.spec
index 74190dba2a6b2838d01316b38a73926500429769..caa031216865deed03ebabfc23f721c6c7936cc3 100644 (file)
--- a/lcms.spec
+++ b/lcms.spec
@@ -7,7 +7,6 @@ License:        LGPL
 Group:         Libraries
 Source0:       http://www.littlecms.com/%{name}-%{version}.tar.gz
 Patch0:                %{name}-makefiles.patch
-Patch1:                %{name}-qt3.patch
 URL:           http://www.littlecms.com/
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
@@ -68,7 +67,6 @@ Programy przyk
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
 
 %build
 %{__make} all \