From 6c1dbd4d3ce3acfddb6b039b10fedb5aedc51c29 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Apr 16 2009 18:20:42 +0000 Subject: Apply previous patch. Not actually applied! Add patch to allow make check to succeed. --- diff --git a/argyllcms-1.0.3-autotools.patch b/argyllcms-1.0.3-autotools.patch new file mode 100644 index 0000000..0a00a0c --- /dev/null +++ b/argyllcms-1.0.3-autotools.patch @@ -0,0 +1,26 @@ +=== modified file 'gamut/Makefile.am' +--- gamut/Makefile.am 2008-11-16 13:51:27 +0000 ++++ gamut/Makefile.am 2009-04-16 07:52:09 +0000 +@@ -6,8 +6,7 @@ + + libgammap_a_SOURCES = gammap.h gammap.c nearsmth.c nearsmth.h + +-LDADD=./libgamut.a ./libgammap.a ../numlib/libargyllnum.a ../icc/libicc.a \ +- ../cgats/libcgats.a ../rspl/librspl.a ../plot/libvrml.a ../xicc/libxicc.a ++LDADD=./libgamut.a ./libgammap.a ../icc/libicc.a ../cgats/libcgats.a ../rspl/librspl.a ../plot/libvrml.a ../xicc/libxicc.a ../numlib/libargyllnum.a + + bin_PROGRAMS = viewgam + check_PROGRAMS = smthtest GenRMGam GenVisGam maptest surftest + +=== modified file 'imdi/Makefile.am' +--- imdi/Makefile.am 2008-11-16 13:51:27 +0000 ++++ imdi/Makefile.am 2009-04-16 07:54:07 +0000 +@@ -13,6 +13,7 @@ + greytiff_LDFLAGS=$(BINLDFLAGS) + + check_PROGRAMS = ctest ++ctest_SOURCES = ctest.c cgen.c + + noinst_PROGRAMS = imdi_make + imdi_make_SOURCES = imdi_make.c imdi_gen.c cgen.c + diff --git a/argyllcms.spec b/argyllcms.spec index 1d49d96..0f5405c 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -5,7 +5,7 @@ Name: argyllcms Version: 1.0.3 -Release: 4%{?alphatag}%{?dist} +Release: 5%{?alphatag}%{?dist} Summary: ICC compatible color management system Group: User Interface/X @@ -20,6 +20,7 @@ Patch2: %{name}-1.0.3-remove-libusb-fork-check.patch Patch4: %{name}-1.0.2-legal.patch Patch5: argyllcms-CVE-2009-0583,0584.patch Patch6: argyllcms-CVE-2009-0792.patch +Patch7: argyllcms-1.0.3-autotools.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: libtiff-devel, libusb-devel @@ -67,6 +68,8 @@ This package contains the Argyll color management system documentation. # Legal patch required %patch4 -p1 -b .legal %patch5 -p0 +%patch6 -p0 +%patch7 -p0 # Salvage policy files mv libusb/19-color.fdi . @@ -81,6 +84,8 @@ chmod u+x configure %configure make +%check +make check %install rm -rf %{buildroot} @@ -118,6 +123,10 @@ rm -rf %{buildroot} %changelog +* Thu Apr 16 2009 Jon Ciesla - 1.0.3-5 +- Actually *apply* previous patch. +- Autotools patch from debian to allow for make check. + * Wed Apr 08 2009 Jon Ciesla - 1.0.3-4 - Patch for ICC library CVE-2009-0792.