[libjpeg-turbo/f14/master] Update to 1.0.1 and add -static subpkg (#632859).

[Adam Tkac]

commit 822bec6d222a9f3aa9a72b604c1f6c17ccc6ff4b
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Sep 13 11:00:52 2010 +0200

    Update to 1.0.1 and add -static subpkg (#632859).
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore                     |    1 +
 libjpeg-turbo.spec             |   36 ++++++++++++++++++------
 libjpeg-turbo10-rh617469.patch |   58 ----------------------------------------
 sources                        |    2 +-
 4 files changed, 29 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 812f30f..883cf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libjpeg-turbo-1.0.0.tar.gz
+/libjpeg-turbo-1.0.1.tar.gz
diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 2d3eb5e..b17f15b 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -1,6 +1,6 @@
 Name:		libjpeg-turbo
-Version:	1.0.0
-Release:	3%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 Summary:	A MMX/SSE2 accelerated library for manipulating JPEG image files
 
 Group:		System Environment/Libraries
@@ -21,8 +21,6 @@ Obsoletes:	libjpeg < 6b-47
 # java-1.6.0-openjdk (#rh607554) -- atkac
 Provides:	libjpeg = 6b-47
 
-Patch0:		libjpeg-turbo10-rh617469.patch
-
 %description
 The libjpeg-turbo package contains a library of functions for manipulating
 JPEG images
@@ -31,7 +29,6 @@ JPEG images
 Summary:	Headers for the libjpeg-turbo library
 Group:		Development/Libraries
 Obsoletes:	libjpeg-devel < 6b-47
-Obsoletes:	libjpeg-static < 6b-47
 Provides:	libjpeg-devel = 6b-47
 %if "%{?_isa}" != ""
 Provides:	libjpeg-devel%{_isa} = 6b-47
@@ -56,15 +53,27 @@ can perform various useful transformations on JPEG files. Rdjpgcom
 displays any text comments included in a JPEG file. Wrjpgcom inserts
 text comments into a JPEG file.
 
+%package static
+Summary:	Static version of the libjpeg-turbo library
+Group:		Development/Libraries
+Obsoletes:	libjpeg-static < 6b-47
+Provides:	libjpeg-static = 6b-47
+%if "%{?_isa}" != ""
+Provides:	libjpeg-static%{_isa} = 6b-47
+%endif
+Requires:	libjpeg-turbo-devel%{_isa} = %{version}-%{release}
+
+%description static
+The libjpeg-turbo-static package contains static library for manipulating
+JPEG images
+
 %prep
 %setup -q
 
-%patch0 -p0 -b .rh617469
-
 %build
 autoreconf -fiv
 
-%configure --disable-static
+%configure
 
 make %{?_smp_mflags}
 
@@ -80,7 +89,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{,turbo}jpeg.la
 
 # Don't distribute libjpegturbo because it is unversioned
 rm -f $RPM_BUILD_ROOT/%{_includedir}/turbojpeg.h
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.{so,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,7 +126,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rdjpgcom.1*
 %{_mandir}/man1/wrjpgcom.1*
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/libjpeg.a
+
 %changelog
+* Mon Sep 13 2010 Adam Tkac <atkac redhat com> 1.0.1-1
+- update to 1.0.1
+  - libjpeg-turbo10-rh617469.patch merged
+- add -static subpkg (#632859)
+
 * Wed Aug 04 2010 Adam Tkac <atkac redhat com> 1.0.0-3
 - fix huffman decoder to handle broken JPEGs well (#617469)
 
diff --git a/sources b/sources
index 038a93e..814871f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51270417c3465e5ab5558c1219328609  libjpeg-turbo-1.0.0.tar.gz
+e94b72694c9afd716458367dfe84ce1e  libjpeg-turbo-1.0.1.tar.gz