rpms/libjpeg/devel libjpeg-autoconf.patch, NONE, 1.1 libjpeg.spec, 1.24, 1.25

[Tom Lane (tgl)]

Author: tgl

Update of /cvs/pkgs/rpms/libjpeg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32314

Modified Files:
	libjpeg.spec 
Added Files:
	libjpeg-autoconf.patch 
Log Message:
Work around autoconf 2.62 breakage

libjpeg-autoconf.patch:

--- NEW FILE libjpeg-autoconf.patch ---
Work around bogosity in autoconf-2.62: it breaks #undef's that have a
comment after them, a construct that has worked fine in every previous
autoconf release.  See bz #449471 and bz #449245.


diff -Naur jpeg-6b.orig/jconfig.cfg jpeg-6b/jconfig.cfg
--- jpeg-6b.orig/jconfig.cfg	1994-12-06 11:43:15.000000000 -0500
+++ jpeg-6b/jconfig.cfg	2008-05-31 16:59:32.000000000 -0400
@@ -28,11 +28,16 @@
 
 #ifdef JPEG_CJPEG_DJPEG
 
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
+/* BMP image file format */
+#define BMP_SUPPORTED
+/* GIF image file format */
+#define GIF_SUPPORTED
+/* PBMPLUS PPM/PGM image file format */
+#define PPM_SUPPORTED
+/* Utah RLE image file format */
+#undef RLE_SUPPORTED
+/* Targa image file format */
+#define TARGA_SUPPORTED
 
 #undef TWO_FILE_COMMANDLINE
 #undef NEED_SIGNAL_CATCHER


Index: libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libjpeg.spec	20 Feb 2008 03:50:09 -0000	1.24
+++ libjpeg.spec	20 Jun 2008 01:40:48 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A library for manipulating JPEG image format files
 Name: libjpeg
 Version: 6b
-Release: 41%{?dist}
+Release: 42%{?dist}
 License: IJG
 Group: System Environment/Libraries
 URL: http://www.ijg.org/
@@ -12,6 +12,7 @@
 Patch1: jpeg-c++.patch
 Patch4: libjpeg-cflags.patch
 Patch5: libjpeg-buf-oflo.patch
+Patch6: libjpeg-autoconf.patch
 
 BuildRequires: autoconf libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -56,6 +57,7 @@
 %patch1 -p1 -b .c++
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .oflo
+%patch6 -p1
 
 # For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
 # We need to re-autoconf though, in order to update libtool support,
@@ -116,6 +118,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jun 19 2008 Tom Lane <tgl at redhat.com> - 6b-42
+- Work around autoconf 2.62 breakage
+Resolves: #449471
+Related: #449245
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6b-41
 - Autorebuild for GCC 4.3