Dominique Leuenberger 2015-03-12 15:37:40 +00:00 committed by Git OBS Bridge
commit a9571b3071
4 changed files with 18 additions and 10 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 5 11:43:27 UTC 2015 - jengelh@inai.de
- Remove useless same-name provides. Use download URLs not
dependent on directory structure.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 2 16:22:23 UTC 2015 - normand@linux.vnet.ibm.com Mon Mar 2 16:22:23 UTC 2015 - normand@linux.vnet.ibm.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libjpeg-turbo # spec file for package libjpeg-turbo
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,7 +33,7 @@ Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Graphics/Convertors Group: Productivity/Graphics/Convertors
Url: http://sourceforge.net/projects/libjpeg-turbo Url: http://sourceforge.net/projects/libjpeg-turbo
Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/libjpeg-turbo-%{version}.tar.gz Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Patch0: libjpeg-turbo-1.4.0-int32.patch Patch0: libjpeg-turbo-1.4.0-int32.patch
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
@ -59,8 +59,6 @@ Version: %{libver}
Release: 0 Release: 0
Summary: The MMX/SSE accelerated JPEG compression/decompression library Summary: The MMX/SSE accelerated JPEG compression/decompression library
Group: System/Libraries Group: System/Libraries
Provides: libjpeg%{major} = %{version}
Obsoletes: libjpeg%{major} < %{version}
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: libjpeg-64bit < %{version} Obsoletes: libjpeg-64bit < %{version}
@ -120,7 +118,7 @@ make %{?_smp_mflags}
make test libdir=%{_libdir} make test libdir=%{_libdir}
%install %install
%makeinstall %make_install
# Fix perms # Fix perms
chmod -x README-turbo.txt chmod -x README-turbo.txt
# Remove unwanted files # Remove unwanted files

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 5 11:43:27 UTC 2015 - jengelh@inai.de
- Remove useless same-name provides. Use download URLs not
dependent on directory structure.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 2 16:24:05 UTC 2015 - normand@linux.vnet.ibm.com Mon Mar 2 16:24:05 UTC 2015 - normand@linux.vnet.ibm.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libjpeg62-turbo # spec file for package libjpeg62-turbo
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,7 @@ Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Graphics/Convertors Group: Productivity/Graphics/Convertors
Url: http://sourceforge.net/projects/libjpeg-turbo Url: http://sourceforge.net/projects/libjpeg-turbo
Source0: http://downloads.sourceforge.net/project/libjpeg-turbo/%{version}/libjpeg-turbo-%{version}.tar.gz Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Patch0: libjpeg-turbo-1.4.0-int32.patch Patch0: libjpeg-turbo-1.4.0-int32.patch
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
@ -49,9 +49,7 @@ Version: %{libver}
Release: 0 Release: 0
Summary: The MMX/SSE accelerated JPEG compression/decompression library Summary: The MMX/SSE accelerated JPEG compression/decompression library
Group: System/Libraries Group: System/Libraries
Provides: libjpeg%{major} = %{version}
Obsoletes: libjpeg = 6.2.0 Obsoletes: libjpeg = 6.2.0
Obsoletes: libjpeg%{major} < %{version}
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: libjpeg-64bit < %{version} Obsoletes: libjpeg-64bit < %{version}
@ -98,7 +96,7 @@ make %{?_smp_mflags}
make test libdir=%{_libdir} make test libdir=%{_libdir}
%install %install
%makeinstall %make_install
# Fix perms # Fix perms
chmod -x README-turbo.txt chmod -x README-turbo.txt
# Remove unwanted files # Remove unwanted files