# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1406075378 -3600
# Node ID 0d2bd9082dffe02bc675bda76be4c73a7885adc8
# Parent  834085a998a4a045b6b511dded8bf65a188d8742
PR1830: Drop version requirement for LCMS 2

2014-06-10  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR1830: Drop version requirement for LCMS 2
	* INSTALL: Document lcms2 requirement.
	* NEWS: Updated.
	* acinclude.m4:
	(IT_CHECK_FOR_LCMS): Drop 2.5 requirement.

diff -r 834085a998a4 -r 0d2bd9082dff ChangeLog
--- a/ChangeLog	Wed Jul 23 01:23:41 2014 +0100
+++ b/ChangeLog	Wed Jul 23 01:29:38 2014 +0100
@@ -1,3 +1,11 @@
+2014-06-10  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1830: Drop version requirement for LCMS 2
+	* INSTALL: Document lcms2 requirement.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
+
 2014-07-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* Makefile.am:
diff -r 834085a998a4 -r 0d2bd9082dff INSTALL
--- a/INSTALL	Wed Jul 23 01:23:41 2014 +0100
+++ b/INSTALL	Wed Jul 23 01:29:38 2014 +0100
@@ -30,6 +30,7 @@
 libpng-devel
 libjpeg-devel >= 6b
 zlib-devel
+lcms2-devel (for --enable-system-lcms)
 rhino (can be disabled using --without-rhino)
 libffi (for --enable-zero or on archs other than x86/x86_64/sparc)
 pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
diff -r 834085a998a4 -r 0d2bd9082dff NEWS
--- a/NEWS	Wed Jul 23 01:23:41 2014 +0100
+++ b/NEWS	Wed Jul 23 01:29:38 2014 +0100
@@ -94,6 +94,7 @@
 * Bug fixes
   - Fix accidental reversion of PR1188 for armel
   - PR1781: NSS PKCS11 provider fails to handle multipart AES encryption
+  - PR1830: Drop version requirement for LCMS 2
   - PR1833, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
   - RH905128: [CRASH] OpenJDK-1.7.0 while using NSS security provider and kerberos
 
diff -r 834085a998a4 -r 0d2bd9082dff acinclude.m4
--- a/acinclude.m4	Wed Jul 23 01:23:41 2014 +0100
+++ b/acinclude.m4	Wed Jul 23 01:29:38 2014 +0100
@@ -1970,10 +1970,10 @@
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
     dnl Check for LCMS2 headers and libraries.
-    PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
+    PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
     then
-      AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.])
+      AC_MSG_ERROR([Could not find LCMS 2; install it or build with --disable-system-lcms to use the in-tree copy.])
     fi
     AC_SUBST(LCMS2_CFLAGS)
     AC_SUBST(LCMS2_LIBS)