From 944c2e11603f7f529869e8d883e6a226f9ba7029029bef64b5f789f94707e8e1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 12 Dec 2011 15:51:37 +0000 Subject: [PATCH] Accepting request 96089 from devel:openSUSE:Factory:for-legal - fix license to be in spdx.org format OBS-URL: https://build.opensuse.org/request/show/96089 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=50 --- cairo.changes | 5 +++++ cairo.spec | 17 +++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/cairo.changes b/cairo.changes index 4a8814e..4698325 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 9 11:48:43 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + ------------------------------------------------------------------- Fri Sep 30 20:07:46 UTC 2011 - coolo@suse.com diff --git a/cairo.spec b/cairo.spec index 657f9d5..66a5a90 100644 --- a/cairo.spec +++ b/cairo.spec @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define build_xcb_backend 0 %define build_gl_backend 0 Name: cairo Version: 1.10.2 -Release: 9 +Release: 0 # FIXME: on update, check that cairo-fix-libs.patch (patch1) is still needed (nobody has the right fix for upstream :/) -License: LGPLv2.1+ ; MPL .. Summary: Vector Graphics Library with Cross-Device Output Support -Url: http://cairographics.org/ +License: LGPL-2.1+ ; MPL-1.1 Group: Development/Libraries/X11 +Url: http://cairographics.org/ Source: %{name}-%{version}.tar.bz2 Source99: baselibs.conf # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version. @@ -63,8 +62,6 @@ hardware acceleration when available. %package -n libcairo2 Summary: Vector Graphics Library with Cross-Device Output Support -License: LGPLv2.1+ ; MPL .. -Group: Development/Libraries/X11 Provides: cairo = %{version} Obsoletes: cairo < %{version} # bug437293 @@ -82,8 +79,6 @@ hardware acceleration when available. %package -n libcairo-gobject2 Summary: Vector Graphics Library with Cross-Device Output Support -License: LGPLv2.1+ ; MPL .. -Group: Development/Libraries/X11 %description -n libcairo-gobject2 Cairo is a vector graphics library with cross-device output support. @@ -97,8 +92,6 @@ meant to support gobject-introspection binding creation. %package -n libcairo-script-interpreter2 Summary: Vector Graphics Library with Cross-Device Output Support -License: LGPLv2.1+ ; MPL .. -Group: Development/Libraries/X11 %description -n libcairo-script-interpreter2 Cairo is a vector graphics library with cross-device output support. @@ -109,8 +102,6 @@ hardware acceleration when available. %package tools Summary: Vector Graphics Library with Cross-Device Output Support -- Utilities -License: LGPLv2.1+ ; MPL .. -Group: Development/Libraries/X11 # We need an explicit requires since nothing links to the cairo library Requires: libcairo2 = %{version} # Named changed during development of 11.4 @@ -127,9 +118,7 @@ hardware acceleration when available. This package contains various cairo utilities. %package devel -License: LGPLv2.1+ ; MPL .. Summary: Development environment for cairo -Group: Development/Libraries/X11 Requires: libcairo2 = %{version} Requires: libcairo-gobject2 = %{version} Requires: libcairo-script-interpreter2 = %{version}