[argyllcms] Upstream bundles yajl 1.0.0 and it's impossible to easily switch to the system version now Fedora ha

[Richard Hughes]

commit 246f88bcc49892ab4824e3013711b8d23ceb3f87
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Dec 1 21:06:30 2011 +0000

    Upstream bundles yajl 1.0.0 and it's impossible to easily switch to
    the system version now Fedora has switched to libyajl.so.2
    Disable the ucmm functionality as it's not even used in Fedora.

 ...jl-API-has-changed-and-ArgyllCMS-has-not-.patch |   56 ++++++++++++++++++++
 argyllcms.spec                                     |   20 ++++++-
 2 files changed, 74 insertions(+), 2 deletions(-)
---
diff --git a/0001-Upstream-yajl-API-has-changed-and-ArgyllCMS-has-not-.patch b/0001-Upstream-yajl-API-has-changed-and-ArgyllCMS-has-not-.patch
new file mode 100644
index 0000000..565f552
--- /dev/null
+++ b/0001-Upstream-yajl-API-has-changed-and-ArgyllCMS-has-not-.patch
@@ -0,0 +1,56 @@
+diff --git a/configure.ac b/configure.ac
+index 876ebd0..ea5b2e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,11 +20,6 @@ AC_CHECK_LIB(pthread, pthread_create)
+ AC_CHECK_LIB(tiff, TIFFOpen, TIFF_LIBS="-ltiff", , -lm)
+ AC_SUBST([TIFF_LIBS])
+ 
+-AC_CHECK_HEADER([yajl/yajl_common.h],
+-                [YAJL_LIBS="-lyajl"],
+-                [AC_MSG_ERROR([please install yajl])])
+-AC_SUBST([YAJL_LIBS])
+-
+ AC_CHECK_LIB(X11, XOpenDisplay, X_LIBS="$X_LIBS -lX11")
+ AC_CHECK_LIB(Xext, XextFindDisplay, X_LIBS="$X_LIBS -lXext",,-lX11)
+ AC_CHECK_LIB(Xss, XScreenSaverSuspend, X_LIBS="$X_LIBS -lXss",,-lXext -lX11)
+diff -up hargyllcms-1.3.5/h/aconfig.h.BAD hargyllcms-1.3.5/h/aconfig.h
+--- hargyllcms-1.3.5/h/aconfig.h.BAD	2011-12-01 19:41:05.373294460 +0000
++++ hargyllcms-1.3.5/h/aconfig.h	2011-12-01 19:41:22.311293287 +0000
+@@ -16,10 +16,6 @@
+ /* Maximum file path length */
+ #define MAXNAMEL 1024
+ 
+-#if defined(UNIX) && !defined(__APPLE__)
+-#define USE_UCMM		/* Enable the Unix micro CMM */
+-#endif
+-
+ #ifndef SALONEINSTLIB
+ #define ENABLE_SERIAL	/* Enable access to serial instruments */
+ #define ENABLE_USB		/* Enable access to USB instruments using libusb */
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 176fbea..ad5fcdc 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -6,7 +6,6 @@ AM_CFLAGS = -DUNIX -I $(top_srcdir)/cgats -I$(top_srcdir)/gamut		\
+     -I$(top_srcdir)/numlib -I$(top_srcdir)/plot -I$(top_srcdir)/profile	\
+     -I$(top_srcdir)/render -I$(top_srcdir)/rspl -I$(top_srcdir)/spectro	\
+     -I$(top_srcdir)/target -I$(top_srcdir)/xicc -I$(top_srcdir)/ucmm	\
+-    -I$(top_srcdir)/jcnf						\
+     -DUSE_LIBUSB1							\
+     $(USB_CFLAGS) $(TIFF_CFLAGS)
+ 
+@@ -25,10 +24,6 @@ libargyll_a_SOURCES += ../plot/plot.h ../plot/plot.c
+ 
+ libargyll_a_SOURCES += ../plot/vrml.h ../plot/vrml.c
+ 
+-libargyll_a_SOURCES += ../ucmm/ucmm.h ../ucmm/ucmm.c
+-
+-libargyll_a_SOURCES += ../jcnf/jcnf.h ../jcnf/jcnf.c
+-
+ libargyll_a_SOURCES += ../profile/prof.h ../profile/profin.c ../profile/profout.c
+ 
+ libargyll_a_SOURCES += ../render/render.h ../render/render.c
+-- 
+1.7.7.3
+
diff --git a/argyllcms.spec b/argyllcms.spec
index 4fa57ce..4bfbc8d 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,11 +1,19 @@
 Name:    argyllcms
 Version: 1.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ICC compatible color management system
 Group:   User Interface/X
 License: GPLv3 and MIT
 URL:     http://gitorious.org/hargyllcms
 Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}.tar.xz
+
+# Upstream bundles yajl 1.0.0 and it's impossible to easily
+# switch to the system version now Fedora has switched to libyajl.so.2
+Patch0:    0001-Upstream-yajl-API-has-changed-and-ArgyllCMS-has-not-.patch
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: libtiff-devel
 BuildRequires: libusb1-devel
 BuildRequires: libX11-devel
@@ -14,7 +22,6 @@ BuildRequires: libXxf86vm-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: libXrandr-devel
-BuildRequires: yajl-devel
 Requires: udev
 
 %description
@@ -47,6 +54,10 @@ This package contains the Argyll color management system documentation.
 
 %prep
 %setup -q -n hargyllcms-%{version}
+%patch0 -p1 -b .no-yajl
+autoreconf
+automake
+
 # we're not allowed to refer to acquisition devices as scanners
 ./legal.sh
 
@@ -76,6 +87,11 @@ rm -rf %{buildroot}
 %doc doc/*.html doc/*.jpg doc/*.txt
 
 %changelog
+* Thu Dec 01 2011 Richard Hughes <rhughes at redhat.com> - 1.3.5-2
+- Upstream bundles yajl 1.0.0 and it's impossible to easily switch to
+  the system version now Fedora has switched to libyajl.so.2
+- Disable the ucmm functionality as it's not even used in Fedora.
+
 * Thu Dec 01 2011 Richard Hughes <rhughes at redhat.com> - 1.3.5-1
 - Update to 1.3.5