From 4be3f76577a21a44b2d52571baac5e9a3a83539c7574d168a9778ab0c78351b2 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Mon, 16 Jun 2014 20:15:53 +0000
Subject: [PATCH] Accepting request 236966 from
home:dirkmueller:branches:devel:languages:python
- license update: (Apache-2.0 or BSD-3-Clause) and GPL-2.0+
missing BSD-license
OBS-URL: https://build.opensuse.org/request/show/236966
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testresources?expand=0&rev=7
---
python-testresources.changes | 6 ++++++
python-testresources.spec | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/python-testresources.changes b/python-testresources.changes
index d7a18a9..50f75d7 100644
--- a/python-testresources.changes
+++ b/python-testresources.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 12 08:42:01 UTC 2014 - cdenicolo@suse.com
+
+- license update: (Apache-2.0 or BSD-3-Clause) and GPL-2.0+
+ missing BSD-license
+
-------------------------------------------------------------------
Thu Oct 24 11:15:49 UTC 2013 - speilicke@suse.com
diff --git a/python-testresources.spec b/python-testresources.spec
index 172e6f6..fb8ce2f 100644
--- a/python-testresources.spec
+++ b/python-testresources.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-testresources
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -20,7 +20,7 @@ Name: python-testresources
Version: 0.2.7
Release: 0
Summary: Testresources, a pyunit extension for managing expensive test resources
-License: Apache-2.0 and GPL-2.0+
+License: (Apache-2.0 or BSD-3-Clause) and GPL-2.0+
Group: Development/Languages/Python
Url: https://launchpad.net/testresources
Source: http://pypi.python.org/packages/source/t/testresources/testresources-%{version}.tar.gz