rpms/mingw32-libjpeg/F-10 configure.in, NONE, 1.1 import.log, NONE, 1.1 jpeg-c++.patch, NONE, 1.1 jpeg-mingw32.patch, NONE, 1.1 libjpeg-autoconf.patch, NONE, 1.1 libjpeg-buf-oflo.patch, NONE, 1.1 libjpeg-cflags.patch, NONE, 1.1 mingw32-libjpeg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libjpeg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28081/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	configure.in import.log jpeg-c++.patch jpeg-mingw32.patch 
	libjpeg-autoconf.patch libjpeg-buf-oflo.patch 
	libjpeg-cflags.patch mingw32-libjpeg.spec 
Log Message:
Initial import.



--- NEW FILE configure.in ---
dnl IJG auto-configuration source file.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(jcmaster.c)
AC_CONFIG_HEADER(jconfig.h:jconfig.cfg)
dnl
dnl do these first since other macros rely on them
AC_PROG_CC
AC_PROG_CPP
dnl
dnl See if compiler supports prototypes.
AC_MSG_CHECKING(for function prototypes)
AC_CACHE_VAL(ijg_cv_have_prototypes,
[AC_TRY_COMPILE([
int testfunction (int arg1, int * arg2); /* check prototypes */
struct methods_struct {		/* check method-pointer declarations */
  int (*error_exit) (char *msgtext);
  int (*trace_message) (char *msgtext);
  int (*another_method) (void);
};
int testfunction (int arg1, int * arg2) /* check definitions */
{ return arg2[arg1]; }
int test2function (void)	/* check void arg list */
{ return 0; }
], [ ], ijg_cv_have_prototypes=yes, ijg_cv_have_prototypes=no)])
AC_MSG_RESULT($ijg_cv_have_prototypes)
if test $ijg_cv_have_prototypes = yes; then
  AC_DEFINE(HAVE_PROTOTYPES,1)
else
  echo Your compiler does not seem to know about function prototypes.
  echo Perhaps it needs a special switch to enable ANSI C mode.
  echo If so, we recommend running configure like this:
  echo "   ./configure  CC='cc -switch'"
  echo where -switch is the proper switch.
fi
dnl
dnl check header files
AC_CHECK_HEADER(stddef.h, AC_DEFINE(HAVE_STDDEF_H,1))
AC_CHECK_HEADER(stdlib.h, AC_DEFINE(HAVE_STDLIB_H,1))
AC_CHECK_HEADER(string.h,, AC_DEFINE(NEED_BSD_STRINGS,1))
dnl See whether type size_t is defined in any ANSI-standard places;
dnl if not, perhaps it is defined in <sys/types.h>.
AC_MSG_CHECKING(for size_t)
AC_TRY_COMPILE([
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include <stdio.h>
#ifdef NEED_BSD_STRINGS
#include <strings.h>
#else
#include <string.h>
#endif
typedef size_t my_size_t;
], [ my_size_t foovar; ], ijg_size_t_ok=yes,
[ijg_size_t_ok="not ANSI, perhaps it is in sys/types.h"])
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" != yes; then
AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(NEED_SYS_TYPES_H,1)
AC_EGREP_CPP(size_t, [#include <sys/types.h>],
[ijg_size_t_ok="size_t is in sys/types.h"], ijg_size_t_ok=no)],
ijg_size_t_ok=no)
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" = no; then
  echo Type size_t is not defined in any of the usual places.
  echo Try putting '"typedef unsigned int size_t;"' in jconfig.h.
fi
fi
dnl
dnl check compiler characteristics
AC_MSG_CHECKING(for type unsigned char)
AC_TRY_COMPILE(, [ unsigned char un_char; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_CHAR,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type unsigned short)
AC_TRY_COMPILE(, [ unsigned short un_short; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_SHORT,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type void)
AC_TRY_COMPILE([
/* Caution: a C++ compiler will insist on valid prototypes */
typedef void * void_ptr;	/* check void * */
#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
typedef void (*void_func) (int a, int b);
#else
typedef void (*void_func) ();
#endif

#ifdef HAVE_PROTOTYPES		/* check void function result */
void test3function (void_ptr arg1, void_func arg2)
#else
void test3function (arg1, arg2)
     void_ptr arg1;
     void_func arg2;
#endif
{
  char * locptr = (char *) arg1; /* check casting to and from void * */
  arg1 = (void *) locptr;
  (*arg2) (1, 2);		/* check call of fcn returning void */
}
], [ ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(void,char)])

AC_C_CONST
dnl check for non-broken inline under various spellings
AC_MSG_CHECKING(for inline)
ijg_cv_inline=""
AC_TRY_COMPILE(, [} __inline__ int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline__",
AC_TRY_COMPILE(, [} __inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline",
AC_TRY_COMPILE(, [} inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="inline")))
AC_MSG_RESULT($ijg_cv_inline)
AC_DEFINE_UNQUOTED(INLINE,$ijg_cv_inline)
dnl we cannot check for bogus warnings, but at least we can check for errors
AC_MSG_CHECKING(for broken incomplete types)
AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
AC_MSG_RESULT(ok),
[AC_MSG_RESULT(broken)
AC_DEFINE(INCOMPLETE_TYPES_BROKEN,1)])
dnl test whether global names are unique to at least 15 chars
AC_MSG_CHECKING(for short external names)
AC_TRY_LINK([
int possibly_duplicate_function () { return 0; }
int possibly_dupli_function () { return 1; }
], [ ], AC_MSG_RESULT(ok), [AC_MSG_RESULT(short)
AC_DEFINE(NEED_SHORT_EXTERNAL_NAMES,1)])
dnl
dnl run-time checks
AC_MSG_CHECKING(to see if char is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_char_signed (int arg)
#else
int is_char_signed (arg)
     int arg;
#endif
{
  if (arg == 189) {		/* expected result for unsigned char */
    return 0;			/* type char is unsigned */
  }
  else if (arg != -67) {	/* expected result for signed char */
    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
    printf("I fear the JPEG software will not work at all.\n\n");
  }
  return 1;			/* assume char is signed otherwise */
}
char signed_char_check = (char) (-67);
int main() {
  exit(is_char_signed((int) signed_char_check));
}], [AC_MSG_RESULT(no)
AC_DEFINE(CHAR_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
[echo Assuming that char is signed on target machine.
echo If it is unsigned, this will be a little bit inefficient.
])
dnl
AC_MSG_CHECKING(to see if right shift is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_shifting_signed (long arg)
#else
int is_shifting_signed (arg)
     long arg;
#endif
/* See whether right-shift on a long is signed or not. */
{
  long res = arg >> 4;

  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
    return 1;			/* right shift is signed */
  }
  /* see if unsigned-shift hack will fix it. */
  /* we can't just test exact value since it depends on width of long... */
  res |= (~0L) << (32-4);
  if (res == -0x7F7E80CL) {	/* expected result now? */
    return 0;			/* right shift is unsigned */
  }
  printf("Right shift isn't acting as I expect it to.\n");
  printf("I fear the JPEG software will not work at all.\n\n");
  return 0;			/* try it with unsigned anyway */
}
int main() {
  exit(is_shifting_signed(-0x7F7E80B1L));
}], [AC_MSG_RESULT(no)
AC_DEFINE(RIGHT_SHIFT_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
AC_MSG_RESULT(Assuming that right shift is signed on target machine.))
dnl
AC_MSG_CHECKING(to see if fopen accepts b spec)
AC_TRY_RUN([
#include <stdio.h>
int main() {
  if (fopen("conftestdata", "wb") != NULL)
    exit(0);
  exit(1);
}], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(DONT_USE_B_MODE,1)],
AC_MSG_RESULT(Assuming that it does.))
dnl
dnl system services
AC_PROG_INSTALL
AC_PROG_RANLIB

# Decide whether to use libtool,
# and if so whether to build shared, static, or both flavors of library.
AC_DISABLE_SHARED
AC_DISABLE_STATIC
if test "x$enable_shared" != xno  -o  "x$enable_static" != xno; then
  USELIBTOOL="yes"

  # Configure libtool.
  AC_PROG_LIBTOOL

  LIBTOOL="./libtool"
  O="lo"
  A="la"
  LN='$(LIBTOOL) --mode=link $(CC)'
  INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
  INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
else
  USELIBTOOL="no"
  LIBTOOL=""
  O="o"
  A="a"
  LN='$(CC)'
  INSTALL_LIB="$INSTALL_DATA"
fi
AC_SUBST(LIBTOOL)
AC_SUBST(O)
AC_SUBST(A)
AC_SUBST(LN)
AC_SUBST(INSTALL_LIB)

# Select memory manager depending on user input.
# If no "-enable-maxmem", use jmemnobs
MEMORYMGR='jmemnobs.$(O)'
MAXMEM="no"
AC_ARG_ENABLE(maxmem,
[  --enable-maxmem[=N]     enable use of temp files, set max mem usage to N MB],
MAXMEM="$enableval")
dnl [# support --with-maxmem for backwards compatibility with IJG V5.]
dnl AC_ARG_WITH(maxmem, , MAXMEM="$withval")
if test "x$MAXMEM" = xyes; then
  MAXMEM=1
fi
if test "x$MAXMEM" != xno; then
changequote(, )dnl
  if test -n "`echo $MAXMEM | sed 's/[0-9]//g'`"; then
changequote([, ])dnl
    AC_MSG_ERROR(non-numeric argument to --enable-maxmem)
  fi
  DEFAULTMAXMEM=`expr $MAXMEM \* 1048576`
AC_DEFINE_UNQUOTED(DEFAULT_MAX_MEM, ${DEFAULTMAXMEM})
AC_MSG_CHECKING([for 'tmpfile()'])
AC_TRY_LINK([#include <stdio.h>], [ FILE * tfile = tmpfile(); ],
[AC_MSG_RESULT(yes)
MEMORYMGR='jmemansi.$(O)'],
[AC_MSG_RESULT(no)
dnl if tmpfile is not present, must use jmemname.
MEMORYMGR='jmemname.$(O)'
AC_DEFINE(NEED_SIGNAL_CATCHER,1)
AC_MSG_CHECKING([for 'mktemp()'])
AC_TRY_LINK(, [ char fname[80]; mktemp(fname); ], AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_DEFINE(NO_MKTEMP,1)])])
fi
AC_SUBST(MEMORYMGR)

# Include PNG support in cjpeg/djpeg if appropriate.
AC_ARG_WITH(png,
[  --with-png              enable PNG support in cjpeg/djpeg],
[#], [with_png="maybe"])

# try to detect whether libpng is present
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(png.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(zlib.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(z, deflate, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(png, png_create_info_struct,
	[with_png="yes"], [with_png="no"], [-lz -lm])
fi

if test "x$with_png" = xyes ; then
  AC_DEFINE(PNG_SUPPORTED,1)
  LIBS="-lpng -lz -lm $LIBS"
fi

# Extract the library version ID from jpeglib.h.
AC_MSG_CHECKING([libjpeg version number])
[JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`]
AC_MSG_RESULT($JPEG_LIB_VERSION)
AC_SUBST(JPEG_LIB_VERSION)

# Prepare to massage makefile.cfg correctly.
if test $ijg_cv_have_prototypes = yes; then
  A2K_DEPS=""
  COM_A2K="# "
else
  A2K_DEPS="ansi2knr"
  COM_A2K=""
fi
AC_SUBST(A2K_DEPS)
AC_SUBST(COM_A2K)
# ansi2knr needs -DBSD if string.h is missing
if test $ac_cv_header_string_h = no; then
  ANSI2KNRFLAGS="-DBSD"
else
  ANSI2KNRFLAGS=""
fi
AC_SUBST(ANSI2KNRFLAGS)
dnl
# Substitutions to enable or disable libtool-related stuff
if test $USELIBTOOL = yes -a $ijg_cv_have_prototypes = yes; then
  COM_LT=""
else
  COM_LT="# "
fi
AC_SUBST(COM_LT)
if test "x$enable_shared" != xno; then
  FORCE_INSTALL_LIB="install-lib"
else
  FORCE_INSTALL_LIB=""
fi
AC_SUBST(FORCE_INSTALL_LIB)
dnl
# Set up -I directives
if test "x$srcdir" = x.; then
  INCLUDEFLAGS='-I$(srcdir)'
else
  if test "x$GCC" = xyes; then
    INCLUDEFLAGS='-I- -I. -I$(srcdir)'
  else
    INCLUDEFLAGS='-I. -I$(srcdir)'
  fi
fi
AC_SUBST(INCLUDEFLAGS)
dnl
AC_OUTPUT(Makefile:makefile.cfg)


--- NEW FILE import.log ---
mingw32-libjpeg-6b-8_fc11:F-10:mingw32-libjpeg-6b-8.fc11.src.rpm:1233315961

jpeg-c++.patch:

--- NEW FILE jpeg-c++.patch ---
--- jpeg-6b/jpeglib.h.c++	Sat Jun 17 21:58:15 2000
+++ jpeg-6b/jpeglib.h	Sat Jun 17 21:58:53 2000
@@ -13,6 +13,10 @@
 #ifndef JPEGLIB_H
 #define JPEGLIB_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * First we include the configuration files that record how this
  * installation of the JPEG library is set up.  jconfig.h can be
@@ -1091,6 +1095,10 @@
 #ifdef JPEG_INTERNALS
 #include "jpegint.h"		/* fetch private declarations */
 #include "jerror.h"		/* fetch error codes too */
+#endif
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* JPEGLIB_H */

jpeg-mingw32.patch:

--- NEW FILE jpeg-mingw32.patch ---
diff -rup jpeg-6b/makefile.cfg jpeg-6b.new/makefile.cfg
--- jpeg-6b/makefile.cfg	2008-09-09 09:54:38.000000000 -0400
+++ jpeg-6b.new/makefile.cfg	2008-09-09 09:55:03.000000000 -0400
@@ -169,7 +169,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
-		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
+		-no-undefined -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
 

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

libjpeg-buf-oflo.patch:

--- NEW FILE libjpeg-buf-oflo.patch ---
Dike out a section of code that has no usefulness on Unix-like systems,
and will crash if fed a comment string exceeding 64K.  Per report from
Lubomir Kundrak, RH bug #226965


diff -Naur jpeg-6b.orig/wrjpgcom.c jpeg-6b/wrjpgcom.c
--- jpeg-6b.orig/wrjpgcom.c	1997-10-23 00:47:03.000000000 -0400
+++ jpeg-6b/wrjpgcom.c	2007-06-25 22:26:42.000000000 -0400
@@ -446,6 +446,8 @@
     } else if (keymatch(arg, "comment", 1)) {
       if (++argn >= argc) usage();
       comment_arg = argv[argn];
+#if 0
+#error "There is a buffer overflow in the code below"
       /* If the comment text starts with '"', then we are probably running
        * under MS-DOG and must parse out the quoted string ourselves.  Sigh.
        */
@@ -466,6 +468,7 @@
 	  strcat(comment_arg, argv[argn]);
 	}
       }
+#endif
       comment_length = (unsigned int) strlen(comment_arg);
     } else
       usage();

libjpeg-cflags.patch:

--- NEW FILE libjpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:


--- NEW FILE mingw32-libjpeg.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Build the programs like cjpeg, etc.
# https://bugzilla.redhat.com/show_bug.cgi?id=467401c7
%define build_programs 0

Name:           mingw32-libjpeg
Version:        6b
Release:        8%{?dist}
Summary:        MinGW Windows Libjpeg library

License:        IJG
URL:            http://www.ijg.org/
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
Source1:        configure.in

Patch1:         jpeg-c++.patch
Patch4:         libjpeg-cflags.patch
Patch5:         libjpeg-buf-oflo.patch
Patch6:         libjpeg-autoconf.patch

Patch100:       jpeg-mingw32.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-zlib
BuildRequires:  autoconf, libtool


%description
MinGW Windows Libjpeg library.


%prep
%setup -q -n jpeg-6b

%patch1 -p1 -b .c++
%patch4 -p1 -b .cflags
%patch5 -p1 -b .oflo
%patch6 -p1

%patch100 -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,
# so supply configure.in.
cp %{SOURCE1} configure.in

# libjpeg 6b includes a horribly obsolete version of libtool.
# Blow it away and replace with build system's version.
rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4

cat /usr/share/aclocal/libtool.m4 > aclocal.m4
# If this is the new libtool 2.x, we need to append some additional
# files.  Rather than hard-coding a version of libtool, just test
# if the files exist and append them:
for f in \
  /usr/share/aclocal/ltoptions.m4 \
  /usr/share/aclocal/ltversion.m4 \
  /usr/share/aclocal/ltsugar.m4 \
  /usr/share/aclocal/lt~obsolete.m4; do
  if [ -f $f ]; then cat $f >> aclocal.m4; fi
done

# Now we can run libtool.
libtoolize

# Automake can fail - we only need this to get config.sub and config.guess.
automake -a ||:

# Finally because we replaced configure.in:
autoconf


%build
%{_mingw32_configure} --enable-shared --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}/man1

%{_mingw32_makeinstall}

# Remove manual pages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
# Rename or remove win32 native binaries
for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
%if %build_programs
   mv $i $i.exe
%else
   rm $i
%endif
done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README
%if %build_programs
%{_mingw32_bindir}/cjpeg.exe
%{_mingw32_bindir}/djpeg.exe
%{_mingw32_bindir}/jpegtran.exe
%{_mingw32_bindir}/rdjpgcom.exe
%{_mingw32_bindir}/wrjpgcom.exe
%endif
%{_mingw32_bindir}/libjpeg-62.dll
%{_mingw32_includedir}/jconfig.h
%{_mingw32_includedir}/jerror.h
%{_mingw32_includedir}/jmorecfg.h
%{_mingw32_includedir}/jpeglib.h
%{_mingw32_libdir}/libjpeg.dll.a
%{_mingw32_libdir}/libjpeg.la


%changelog
* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-8
- Exclude the binaries.
- Rename the binaries to *.exe (Levente Farkas).

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-7
- Disable static libraries.
- Use _smp_mflags.
- Update for new libtool 2.
- +BR mingw32-dlfcn.
- Added documentation (README includes the license).

* Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-6
- Don't set libdir in the make step.
- Fix path to mandir.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-4
- Switch to tar.bz2 source, and rename configure.in

* Sun Sep 21 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-3
- Fix URL.
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:09:08 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:49:08 -0000	1.2
@@ -0,0 +1 @@
+jpegsrc.v6b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:09:08 -0000	1.1
+++ sources	30 Jan 2009 11:49:09 -0000	1.2
@@ -0,0 +1 @@
+dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz