From 0c0b160f510a76c805a83c900151c7540349d411e6a7a056d591c26b0bd54857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 14 Feb 2012 09:51:32 +0000 Subject: [PATCH] Accepting request 104919 from home:babelworx:ldig:branches:graphics license update: SUSE-ImageMagick Use SUSE- proprietary prefix until SPDX upstream accepts ImageMagick as license (e.g. like Fedora) OBS-URL: https://build.opensuse.org/request/show/104919 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=120 --- ImageMagick.changes | 7 +++++++ ImageMagick.spec | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 909a037..067e321 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 14 09:02:14 UTC 2012 - cfarrell@suse.com + +- license update: SUSE-ImageMagick + Use SUSE- proprietary prefix until SPDX upstream accepts ImageMagick as + license (e.g. like Fedora) + ------------------------------------------------------------------- Thu Jan 19 15:29:00 UTC 2012 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 3aa3e76..8602b8d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -100,7 +100,7 @@ Version: %{mfr_version}.%{mfr_revision} Release: 0 %define libver 5 Summary: Viewer and Converter for Images -License: SUSE-Public-Domain +License: SUSE-ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org Source: ImageMagick-%{source_version}.tar.bz2 @@ -123,14 +123,14 @@ Obsoletes: imagemag < %{version} %package -n perl-PerlMagick Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version} Summary: Perl interface for ImageMagick -License: SUSE-Public-Domain +License: SUSE-ImageMagick Group: Development/Libraries/Perl %package devel Requires: libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{version} Requires: ImageMagick = %{version} Summary: Include Files and Libraries Mandatory for Development -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Development/Libraries/C and C++ Requires: glibc-devel # bnc#741947: @@ -139,26 +139,26 @@ Requires: libbz2-devel %package extra Requires: ImageMagick = %{version} libMagickCore%{libver} = %{version} Summary: Viewer and Converter for Images - extra codecs -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Productivity/Graphics/Other #delegates configured in delegates.xml that imagemagick can use Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf %package -n libMagickCore%{libver} Summary: Viewer and Converter for Images - runtime library -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} %package -n libMagickWand%{libver} Summary: Viewer and Converter for Images - runtime library -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Productivity/Graphics/Other %package -n libMagick++%{libver} Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Development/Libraries/C and C++ # was last used in openSUSE 10.2 Provides: ImageMagick-Magick++ = %{version} @@ -167,14 +167,14 @@ Obsoletes: ImageMagick-Magick++ < %{version} %package -n libMagick++-devel Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Development/Libraries/C and C++ Provides: ImageMagick-Magick++-devel = %{version} Obsoletes: ImageMagick-Magick++-devel < %{version} %package doc Summary: Document Files for ImageMagick Library -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-ImageMagick Group: Development/Libraries/C and C++ %if 0%{?suse_version} >= 1120 BuildArch: noarch