From 75c7c4376658189323cfb62ea0e0fe89f1e01c7f Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Fri, 2 Jul 2010 11:33:48 +0000
Subject: [PATCH] - update to 1.0.0 - patches merged -
 libjpeg-turbo-programs.patch - libjpeg-turbo-nosimd.patch - add libjpeg
 provides to the main package to workaround problems with     broken
 java-1.6.0-openjdk package

---
 .cvsignore                   |  2 +-
 libjpeg-turbo-nosimd.patch   | 13 -------------
 libjpeg-turbo-programs.patch | 31 -------------------------------
 libjpeg-turbo.spec           | 25 +++++++++++++++----------
 sources                      |  2 +-
 5 files changed, 17 insertions(+), 56 deletions(-)
 delete mode 100644 libjpeg-turbo-nosimd.patch
 delete mode 100644 libjpeg-turbo-programs.patch

diff --git a/.cvsignore b/.cvsignore
index 1d40c79..812f30f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libjpeg-turbo-0.0.93.tar.gz
+libjpeg-turbo-1.0.0.tar.gz
diff --git a/libjpeg-turbo-nosimd.patch b/libjpeg-turbo-nosimd.patch
deleted file mode 100644
index 303510e..0000000
--- a/libjpeg-turbo-nosimd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up libjpeg-turbo-0.0.93/configure.ac.nosimd libjpeg-turbo-0.0.93/configure.ac
---- libjpeg-turbo-0.0.93/configure.ac.nosimd	2010-06-10 12:02:48.903884378 +0200
-+++ libjpeg-turbo-0.0.93/configure.ac	2010-06-10 12:27:11.721539379 +0200
-@@ -145,7 +145,8 @@ if test "x${with_simd}" != "xno"; then
-     ;;
-     *)
-       AC_MSG_RESULT([no ("$host_cpu")])
--      AC_MSG_ERROR([CPU is not supported])
-+      AC_MSG_WARN([SIMD is not supported on this CPU, performance will suffer])
-+      with_simd=no;
-     ;;
-   esac
- 
diff --git a/libjpeg-turbo-programs.patch b/libjpeg-turbo-programs.patch
deleted file mode 100644
index bd1fd9a..0000000
--- a/libjpeg-turbo-programs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up libjpeg-turbo-1.0.0-20100601svn195/Makefile.am.programs libjpeg-turbo-1.0.0-20100601svn195/Makefile.am
---- libjpeg-turbo-1.0.0-20100601svn195/Makefile.am.programs	2010-05-11 01:39:22.000000000 +0200
-+++ libjpeg-turbo-1.0.0-20100601svn195/Makefile.am	2010-06-03 17:20:58.658321122 +0200
-@@ -39,7 +39,8 @@ endif
- 
- TSTHDRS = rrutil.h rrtimer.h
- 
--noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-+noinst_PROGRAMS = jpgtest jpegut
- 
- jpgtest_SOURCES = $(TSTHDRS) jpgtest.cxx bmp.h bmp.c
- 
-@@ -78,7 +79,7 @@ wrjpgcom_SOURCES = wrjpgcom.c
- wrjpgcom_LDADD = libjpeg.la
- 
- 
--DISTMANS= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
-+man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
- 
- DOCS= README install.doc usage.doc wizard.doc example.c libjpeg.doc \
- 	structure.doc coderules.doc filelist.doc jconfig.doc change.log \
-@@ -88,7 +89,7 @@ DOCS= README install.doc usage.doc wizar
- TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
- 	testimgfst.jpg testimgint.jpg testimgp.jpg testimgfst.ppm testimgint.ppm
- 
--EXTRA_DIST = win release $(DOCS) $(DISTMANS) $(TESTFILES)
-+EXTRA_DIST = win release $(DOCS) $(TESTFILES)
- 
- dist-hook:
- 	rm -rf `find $(distdir) -name .svn`
diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index e76c9ae..a41c3d1 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -1,6 +1,6 @@
 Name:		libjpeg-turbo
-Version:	0.0.93
-Release:	13%{?dist}
+Version:	1.0.0
+Release:	1%{?dist}
 Summary:	A MMX/SSE2 accelerated library for manipulating JPEG image files
 
 Group:		System Environment/Libraries
@@ -14,12 +14,12 @@ BuildRequires:	autoconf, automake, libtool
 BuildRequires:	nasm
 %endif
 
-Patch0:		libjpeg-turbo-programs.patch
-Patch1:		libjpeg-turbo-nosimd.patch
-
 # moved this from -utils, in an attempt to get it to better override
 # libjpeg in rawhide -- Rex
-Obsoletes:      libjpeg < 6b-47
+Obsoletes:	libjpeg < 6b-47
+# add provides (even if it not needed) to workaround bad packages, like
+# java-1.6.0-openjdk (#rh607554) -- atkac
+Provides:	libjpeg = 6b-47
 
 %description
 The libjpeg-turbo package contains a library of functions for manipulating
@@ -54,9 +54,6 @@ text comments into a JPEG file.
 %prep
 %setup -q
 
-%patch0 -p1 -b .programs
-%patch1 -p1 -b .nosimd
-
 %build
 autoreconf -fiv
 
@@ -114,7 +111,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/wrjpgcom.1*
 
 %changelog
-* Fri Jul 02 2010 Adam Tkac <atkac redhat com>  0.0.93-13
+* Fri Jul 02 2010 Adam Tkac <atkac redhat com> 1.0.0-1
+- update to 1.0.0
+- patches merged
+  - libjpeg-turbo-programs.patch
+  - libjpeg-turbo-nosimd.patch
+- add libjpeg provides to the main package to workaround problems with broken
+  java-1.6.0-openjdk package
+
+* Fri Jul 02 2010 Adam Tkac <atkac redhat com> 0.0.93-13
 - remove libjpeg provides from -utils subpkg
 
 * Wed Jun 30 2010 Rex Dieter <rdieter@fedoraproject.org> 0.0.93-12
diff --git a/sources b/sources
index 8bd3dd7..038a93e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac8bb8b00558b077c159a2f35dc196a0  libjpeg-turbo-0.0.93.tar.gz
+51270417c3465e5ab5558c1219328609  libjpeg-turbo-1.0.0.tar.gz