Accepting request 63341 from graphics

Accepted submit request 63341 from user pgajdos

OBS-URL: https://build.opensuse.org/request/show/63341
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libjpeg-turbo?expand=0&rev=4

libjpeg-turbo-1.0.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1675a911b30e9612ef9d3684cc8fb34d199150f878943495ed00c51a16ebae92
-size 1054917

libjpeg-turbo-1.1.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd3d5c71a8c51336093df0f3603b6a268614a2f20375281f010e1c2cb7af9286
+size 1208704

libjpeg-turbo.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Mar  3 13:53:18 CET 2011 - pgajdos@suse.cz
+
+- updated to 1.1.0:
+  * Added further protections against invalid Huffman codes.
+  * Added an extended version of tjDecompressHeader().
+  * Added arithmetic encoding and decoding support.
+  * TurboJPEG/OSS can now compress from/decompress to 
+    grayscale bitmaps.
+  * Added emulation of the libjpeg v7 and v8 APIs and ABIs.
+  * Added two new TurboJPEG API functions, tjEncodeYUV() and
+    tjDecompressToYUV().
+  * The TurboJPEG dynamic library now uses versioned symbols.
+  * Fixed visual artifacts in grayscale JPEG compression 
+    caused by a typo in the RGB-to-chrominance lookup tables.
+- see ChangeLog.txt for details.
+- removed upstreamed jpegtran.patch and rh639672.patch
+
+-------------------------------------------------------------------
+Tue Dec 14 14:32:56 CET 2010 - pgajdos@suse.cz
+
+- spec file cleanup
+
 -------------------------------------------------------------------
 Fri Dec 10 13:02:58 UTC 2010 - pgajdos@novell.com
 

libjpeg-turbo.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libjpeg-turbo (Version 1.0.1)
+# spec file for package jpeg-turbo
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,37 +17,42 @@
 
 # norootforbuild
 
+%define major   62
+%define minor   0
+%define micro   0
+%define srcver  1.1.0
+%define libver  %{major}.%{minor}.%{micro}
+# major number of library from jpeg8
+%define cmajor  8
 
 Name:           libjpeg-turbo
 License:        BSD3c(or similar)
 Group:          Productivity/Graphics/Convertors
 AutoReqProv:    on
-Version:        1.0.1
+Version:        %{srcver}
 Release:        1
 Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
 Url:            http://sourceforge.net/projects/libjpeg-turbo
-BuildRequires:  gcc-c++ nasm
+BuildRequires:  nasm gcc-c++
 Provides:       jpeg = %{version}
 Obsoletes:      jpeg
-Conflicts:      jpeg8
+Conflicts:      jpeg%{major}
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf 
 Patch0:         %{name}-%{version}-int32.patch
 Patch1:         %{name}-%{version}-tiff-ojpeg.patch
-Patch2:         %{name}-%{version}-jpegtran.patch
-Patch3:         %{name}-%{version}-rh639672.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The libjpeg-turbo package contains a library of functions for manipulating
 JPEG images.
 
-%package -n libjpeg62
+%package -n libjpeg%{major}
+
 
 License:        BSD3c(or similar)
 Summary:        The MMX/SSE accelerated JPEG compression/decompression library
-Version:        62.0.0
-Release:        1
+Version:        %{libver}
 Provides:       libjpeg6 = %{version}
 Obsoletes:      libjpeg6
 Group:          System/Libraries
@@ -58,7 +63,7 @@ Obsoletes:      libjpeg-64bit
 %endif
 #
 
-%description -n libjpeg62
+%description -n libjpeg%{major}
 This library contains MMX/SSE accelerated functions for manipulating
 JPEG images.
 
@@ -68,16 +73,15 @@ Authors:
     Rob Hooft <hooft@EMBL-Heidelberg.DE>
     Michael Mauldin <mlm@cs.cmu.edu>
 
-%package -n libjpeg62-devel
+%package -n libjpeg%{major}-devel
 License:        BSD3c(or similar)
 Summary:        Development Tools for applications which will use the Libjpeg Library
-Version:        62.0.0
-Release:        1
+Version:        %{libver}
 Group:          Development/Libraries/C and C++
-Requires:       libjpeg62 = %{version}
+Requires:       libjpeg%{major} = %{version}
 Provides:       libjpeg-devel = %{version}
 Obsoletes:      libjpeg-devel
-Conflicts:      libjpeg8-devel
+Conflicts:      libjpeg%{cmajor}-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      libjpeg-devel-64bit
@@ -95,8 +99,6 @@ files using the libjpeg library.
 %setup -q 
 %patch0
 %patch1
-%patch2
-%patch3 -p1
 
 %build
 autoreconf -fiv
@@ -113,31 +115,33 @@ chmod -x README-turbo.txt
 # Remove unwanted files
 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 $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h
+rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so
+rm $RPM_BUILD_ROOT%{_bindir}/jpgtest
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n libjpeg62 -p /sbin/ldconfig
+%post -n libjpeg%{major} -p /sbin/ldconfig
 
-%postun -n libjpeg62 -p /sbin/ldconfig
+%postun -n libjpeg%{major} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt
+%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt 
+%doc LICENSE.txt usage.txt wizard.txt
 /usr/bin/*
 %doc %{_mandir}/man1/*
 
-%files -n libjpeg62
+%files -n libjpeg%{major}
 %defattr(-,root,root)
-%{_libdir}/libjpeg.so.62.0.0
-%{_libdir}/libjpeg.so.62
+%{_libdir}/libjpeg.so.%{libver}
+%{_libdir}/libjpeg.so.%{major}
 
-%files -n libjpeg62-devel
+%files -n libjpeg%{major}-devel
 %defattr(-,root,root)
 /usr/include/*.h
 %{_libdir}/libjpeg.so
-%doc coderules.doc jconfig.doc libjpeg.doc structure.doc example.c
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
 
 %changelog