From f1beb8bcbd093fca9b02847cf19b80fb386a216a Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sun, 7 Oct 2012 15:08:25 +0200
Subject: [PATCH] Update to 1.2.1

... and drop upstreamed libjpeg-turbo-dont-conflict-with-basetsd-h.diff.
---
 .gitignore                                    |  1 +
 ...eg-turbo-dont-conflict-with-basetsd-h.diff | 16 ----------------
 mingw-libjpeg-turbo.spec                      | 19 ++++++++-----------
 sources                                       |  2 +-
 4 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 libjpeg-turbo-dont-conflict-with-basetsd-h.diff

diff --git a/.gitignore b/.gitignore
index 5a1b1b0..10ef247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libjpeg-turbo-1.1.1.tar.gz
+/libjpeg-turbo-1.2.1.tar.gz
diff --git a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff
deleted file mode 100644
index 318dccb..0000000
--- a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- win/jconfig.h.in.orig	2011-06-03 20:17:01.918582804 +0200
-+++ win/jconfig.h.in	2011-06-03 20:19:23.622100937 +0200
-@@ -25,7 +25,14 @@
- #endif
- #define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
- 
-+/* Define "INT32" as int, not long, per Windows custom */
-+#if !(defined(_BASETSD_H_) || defined(_BASETSD_H))   /* don't conflict if basetsd.h already read */
-+typedef short INT16;
-+typedef signed int INT32;
-+#endif
-+#define XMD_H                   /* prevent jmorecfg.h from redefining it */
-+
- #define inline __inline
- 
- #ifdef JPEG_INTERNALS
diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec
index c1c1ff7..bc19bd2 100644
--- a/mingw-libjpeg-turbo.spec
+++ b/mingw-libjpeg-turbo.spec
@@ -5,8 +5,8 @@
 %global build_programs 0
 
 Name:           mingw-libjpeg-turbo
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        MinGW Windows Libjpeg-turbo library
 
 License:        wxWidgets
@@ -14,12 +14,6 @@ URL:            http://libjpeg-turbo.virtualgl.org/
 Group:          Development/Libraries
 Source0:        http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
 
-# There's a conflict between basetsd.h (w32api) and jmorecfg.h
-# Both contain a definition for the data type INT32, but they're
-# different from each other (signed int vs. long)
-# This patch makes the library use the data type signed int for INT32
-Patch0:         libjpeg-turbo-dont-conflict-with-basetsd-h.diff
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -85,7 +79,6 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
 
 %prep
 %setup -q -n libjpeg-turbo-%{version}
-%patch0 -p0
 
 
 %build
@@ -116,7 +109,7 @@ chmod -x README-turbo.txt
 
 # Win32
 %files -n mingw32-libjpeg-turbo
-%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt
+%doc README README-turbo.txt change.log ChangeLog.txt
 %if %build_programs
 %{mingw32_bindir}/*.exe
 %endif
@@ -136,7 +129,7 @@ chmod -x README-turbo.txt
 
 # Win64
 %files -n mingw64-libjpeg-turbo
-%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt
+%doc README README-turbo.txt change.log ChangeLog.txt
 %if %build_programs
 %{mingw64_bindir}/*.exe
 %endif
@@ -156,6 +149,10 @@ chmod -x README-turbo.txt
 
 
 %changelog
+* Sun Oct 07 2012 Kalev Lember <kalevlember@gmail.com> - 1.2.1-1
+- Update to 1.2.1
+- Dropped upstreamed int32 patch
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 425db53..0e8a5e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03b9c1406c7bfdc204313c2917ce6962  libjpeg-turbo-1.1.1.tar.gz
+f61e60ff01381ece4d2fe65eeb52669e  libjpeg-turbo-1.2.1.tar.gz