From 10fe763ff467eaff7fdb1ce3cef57031f82551ced7157429119e8365e45c74eb Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 1 Mar 2013 10:48:53 +0000 Subject: [PATCH] Accepting request 156958 from openSUSE:Factory:Staging:spdx update license to new format OBS-URL: https://build.opensuse.org/request/show/156958 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=43 --- pacemaker.changes | 5 +++++ pacemaker.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pacemaker.changes b/pacemaker.changes index 3a26b8a..e30894d 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 10:31:54 UTC 2013 - coolo@suse.com + +- update license to new format + ------------------------------------------------------------------- Sat Jul 28 14:21:29 UTC 2012 - aj@suse.de diff --git a/pacemaker.spec b/pacemaker.spec index 795c931..8d44649 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -1,7 +1,7 @@ # # spec file for package pacemaker # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA Version: 1.1.7 Release: 0 @@ -134,7 +134,7 @@ Authors: %package -n libpacemaker3 Summary: The Pacemaker scalable High-Availability cluster resource manager -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA %description -n libpacemaker3 @@ -156,7 +156,7 @@ Authors: %package -n libpacemaker-devel Summary: The Pacemaker scalable High-Availability cluster resource manager -License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} Requires: libglue-devel