From bdb19a8a8e69cafaf71c75ba30b7fb8bcfd9a9c6c4bc1b2e27d5c044c9bc8540 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 10 Mar 2015 13:14:39 +0000 Subject: [PATCH] Accepting request 289799 from home:jengelh:branches:graphics - Remove useless same-name provides. Use download URLs not dependent on directory structure. OBS-URL: https://build.opensuse.org/request/show/289799 OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=54 --- libjpeg-turbo.changes | 6 ++++++ libjpeg-turbo.spec | 8 +++----- libjpeg62-turbo.changes | 6 ++++++ libjpeg62-turbo.spec | 8 +++----- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libjpeg-turbo.changes b/libjpeg-turbo.changes index 94de992..c5b7e96 100644 --- a/libjpeg-turbo.changes +++ b/libjpeg-turbo.changes @@ -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 diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 6d8580c..fb5db49 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,7 +1,7 @@ # # 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 # 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 Group: Productivity/Graphics/Convertors 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 Patch0: libjpeg-turbo-1.4.0-int32.patch Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch @@ -59,8 +59,6 @@ Version: %{libver} Release: 0 Summary: The MMX/SSE accelerated JPEG compression/decompression library Group: System/Libraries -Provides: libjpeg%{major} = %{version} -Obsoletes: libjpeg%{major} < %{version} # bug437293 %ifarch ppc64 Obsoletes: libjpeg-64bit < %{version} @@ -120,7 +118,7 @@ make %{?_smp_mflags} make test libdir=%{_libdir} %install -%makeinstall +%make_install # Fix perms chmod -x README-turbo.txt # Remove unwanted files diff --git a/libjpeg62-turbo.changes b/libjpeg62-turbo.changes index 7453d3f..bba716e 100644 --- a/libjpeg62-turbo.changes +++ b/libjpeg62-turbo.changes @@ -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 diff --git a/libjpeg62-turbo.spec b/libjpeg62-turbo.spec index dacbe14..e4c7412 100644 --- a/libjpeg62-turbo.spec +++ b/libjpeg62-turbo.spec @@ -1,7 +1,7 @@ # # 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 # 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 Group: Productivity/Graphics/Convertors 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 Patch0: libjpeg-turbo-1.4.0-int32.patch Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch @@ -49,9 +49,7 @@ Version: %{libver} Release: 0 Summary: The MMX/SSE accelerated JPEG compression/decompression library Group: System/Libraries -Provides: libjpeg%{major} = %{version} Obsoletes: libjpeg = 6.2.0 -Obsoletes: libjpeg%{major} < %{version} # bug437293 %ifarch ppc64 Obsoletes: libjpeg-64bit < %{version} @@ -98,7 +96,7 @@ make %{?_smp_mflags} make test libdir=%{_libdir} %install -%makeinstall +%make_install # Fix perms chmod -x README-turbo.txt # Remove unwanted files