rpms/libjpeg-turbo/devel .cvsignore, 1.2, 1.3 libjpeg-turbo.spec, 1.5, 1.6 sources, 1.2, 1.3 libjpeg-turbo-nosimd.patch, 1.1, NONE libjpeg-turbo-programs.patch, 1.1, NONE

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/libjpeg-turbo/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29107

Modified Files:
	.cvsignore libjpeg-turbo.spec sources 
Removed Files:
	libjpeg-turbo-nosimd.patch libjpeg-turbo-programs.patch 
Log Message:
- 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg-turbo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jun 2010 12:42:52 -0000	1.2
+++ .cvsignore	2 Jul 2010 11:33:48 -0000	1.3
@@ -1 +1 @@
-libjpeg-turbo-0.0.93.tar.gz
+libjpeg-turbo-1.0.0.tar.gz


Index: libjpeg-turbo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg-turbo/devel/libjpeg-turbo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libjpeg-turbo.spec	2 Jul 2010 09:00:08 -0000	1.5
+++ libjpeg-turbo.spec	2 Jul 2010 11:33:48 -0000	1.6
@@ -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, libto
 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 at fedoraproject.org> 0.0.93-12


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg-turbo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jun 2010 12:42:53 -0000	1.2
+++ sources	2 Jul 2010 11:33:48 -0000	1.3
@@ -1 +1 @@
-ac8bb8b00558b077c159a2f35dc196a0  libjpeg-turbo-0.0.93.tar.gz
+51270417c3465e5ab5558c1219328609  libjpeg-turbo-1.0.0.tar.gz


--- libjpeg-turbo-nosimd.patch DELETED ---


--- libjpeg-turbo-programs.patch DELETED ---