diff --git a/.abf.yml b/.abf.yml index da00f5f..565320c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - libjpeg-turbo-1.3.0.tar.gz: 1792c964b35604cebd3a8846f1ca6de5976e9c28 + libjpeg-turbo-1.4.0.tar.gz: a9ed7a99a6090e0848836c5df8e836f300a098b9 diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 9aa5ac1..a4e67dd 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,18 +1,19 @@ -%define major 8 -%define majorturbo 0 -%define libname %mklibname jpeg %{major} -%define devname %mklibname -d jpeg -%define static %mklibname -s -d jpeg -%define turbo %mklibname turbojpeg %{majorturbo} +%define major 8 +%define libname %mklibname jpeg %{major} +%define devname %mklibname jpeg -d +%define sdevname %mklibname jpeg -d -s -%define major62 62 -%define libname62 %mklibname jpeg %{major62} +%define majorturbo 0 +%define libturbo %mklibname turbojpeg %{majorturbo} + +%define major62 62 +%define libname62 %mklibname jpeg %{major62} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Name: libjpeg-turbo Epoch: 1 -Version: 1.3.0 -Release: 7 +Version: 1.4.0 +Release: 1 License: wxWidgets Library License Group: System/Libraries Url: http://sourceforge.net/projects/libjpeg-turbo @@ -24,7 +25,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source2: http://jpegclub.org/jpegexiforient.c Source3: http://jpegclub.org/exifautotran.txt Patch0: jpeg-6b-c++fixes.patch - BuildRequires: libtool >= 1.4 %ifarch %{ix86} x86_64 BuildRequires: nasm @@ -37,7 +37,9 @@ processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression. It is generally 2-4x as fast as the unmodified version of libjpeg, all else being equal. -%package -n %{libname} +#---------------------------------------------------------------------------- + +%package -n %{libname} Summary: A library for manipulating JPEG image format files Group: System/Libraries @@ -45,39 +47,63 @@ Group: System/Libraries This package contains the library needed to run programs dynamically linked with libjpeg. -%package -n %{libname62} +%files -n %{libname} +%doc change.log ChangeLog.txt README README-turbo.txt +%{_libdir}/libjpeg.so.%{major}* + +#---------------------------------------------------------------------------- + +%package -n %{libname62} Summary: A library for manipulating JPEG image format files Group: System/Libraries %description -n %{libname62} -This package contains the library needed to run programs dynamically -linked with libjpeg. +This package contains the library needed to run programs dynamically linked +with libjpeg. -%package -n %{turbo} +%files -n %{libname62} +%{_libdir}/libjpeg.so.%{major62}* + +#---------------------------------------------------------------------------- + +%package -n %{libturbo} Summary: TurboJPEG library Group: System/Libraries -%description -n %{turbo} -This package contains the library needed to run programs dynamically -linked with libturbojpeg. +%description -n %{libturbo} +This package contains the library needed to run programs dynamically linked +with libturbojpeg. -%package -n %{devname} +%files -n %{libturbo} +%{_libdir}/libturbojpeg.so.%{majorturbo}* + +#---------------------------------------------------------------------------- + +%package -n %{devname} Summary: Development tools for programs which will use the libjpeg library Group: Development/C Requires: %{libname} = %{EVRD} -Requires: %{turbo} = %{EVRD} +Requires: %{libturbo} = %{EVRD} Provides: jpeg-devel = %{EVRD} Conflicts: jpeg6-devel Conflicts: %{_lib}turbojpeg < 1:1.3.0 Obsoletes: %{_lib}turbojpeg < 1:1.3.0 Obsoletes: %{mklibname jpeg 62 -d} < 6b-45 -%description -n %{devname} -The libjpeg-turbo devel package includes the header files necessary for -developing programs which will manipulate JPEG files using the -libjpeg library. +%description -n %{devname} +The libjpeg-turbo devel package includes the header files necessary for +developing programs which will manipulate JPEG files using the libjpeg +library. -%package -n %{static} +%files -n %{devname} +%doc coderules.txt example.c jconfig.txt libjpeg.txt structure.txt +%{_libdir}/libjpeg.so +%{_libdir}/libturbojpeg.so +%{_includedir}/*.h + +#---------------------------------------------------------------------------- + +%package -n %{sdevname} Summary: Static libraries for programs which will use the libjpeg library Group: Development/C Requires: %{devname} = %{EVRD} @@ -85,19 +111,25 @@ Provides: jpeg-static-devel = %{EVRD} Conflicts: jpeg6-static-devel Obsoletes: %{mklibname jpeg 62 -d -s} < 6b-45 Obsoletes: %{mklibname jpeg 7 -d -s} < 7-3 - -%description -n %{static} -The libjpeg static devel package includes the static libraries -necessary for developing programs which will manipulate JPEG files using -the libjpeg library. - -%package -n jpeg-progs + +%description -n %{sdevname} +The libjpeg static devel package includes the static libraries necessary +for developing programs which will manipulate JPEG files using the libjpeg +library. + +%files -n %{sdevname} +%{_libdir}/libjpeg.a +%{_libdir}/libturbojpeg.a + +#---------------------------------------------------------------------------- + +%package -n jpeg-progs Summary: Programs for manipulating JPEG format image files Group: Graphics %rename libjpeg-progs %rename jpeg6-progs -%description -n jpeg-progs +%description -n jpeg-progs This package contains simple client programs for accessing the libjpeg functions. The library client programs include cjpeg, djpeg, jpegtran, rdjpgcom, wrjpgcom and jpegexiforient, coupled with the script @@ -110,6 +142,13 @@ Wrjpgcom inserts text comments into a JPEG file. Jpegexiforient allow automatic lossless rotation of JPEG images from a digital camera which have orientation markings in the EXIF data. +%files -n jpeg-progs +%doc usage.txt wizard.txt +%{_bindir}/* +%{_mandir}/man1/* + +#---------------------------------------------------------------------------- + %prep %setup -q %patch0 -p0 @@ -156,28 +195,3 @@ install -m644 jpegint.h -D %{buildroot}%{_includedir}/jpegint.h # cleanup rm -f %{buildroot}%{_docdir}/* -%files -n %{libname} -%doc change.log ChangeLog.txt README README-turbo.txt -%{_libdir}/libjpeg.so.%{major}* - -%files -n %{libname62} -%{_libdir}/libjpeg.so.%{major62}* - -%files -n %{turbo} -%{_libdir}/libturbojpeg.so.%{majorturbo}* - -%files -n %{devname} -%doc coderules.txt example.c jconfig.txt libjpeg.txt structure.txt -%{_libdir}/libjpeg.so -%{_libdir}/libturbojpeg.so -%{_includedir}/*.h - -%files -n %{static} -%{_libdir}/libjpeg.a -%{_libdir}/libturbojpeg.a - -%files -n jpeg-progs -%doc usage.txt wizard.txt -%{_bindir}/* -%{_mandir}/man1/* -