From b0d56156f9a2391e8222fb190571bafb76a7a0f62249eb69e84aa4760f7cdfe1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Nov 2010 14:24:11 +0000 Subject: [PATCH 1/4] prepare_spec OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=5 --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 6e4e270..6a6553d 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -22,7 +22,7 @@ Name: xmlunit Version: 1.0 -Release: 1 +Release: 6%{?dist} Summary: Provides classes to do asserts on XML License: BSD Url: http://xmlunit.sourceforge.net/ From 915ede4d0eba0b0c3b13dad972db3d6e50ec42f28aa30e5c43a86956db040b1b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Nov 2010 14:25:03 +0000 Subject: [PATCH 2/4] sync with O:F OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=6 --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 6a6553d..6e4e270 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -22,7 +22,7 @@ Name: xmlunit Version: 1.0 -Release: 6%{?dist} +Release: 1 Summary: Provides classes to do asserts on XML License: BSD Url: http://xmlunit.sourceforge.net/ From 6c6fc94fb23cfc1c8b86ecd6f5221b43d70b52dcc171da200d1a112e02346612 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 8 Dec 2011 15:44:14 +0000 Subject: [PATCH 3/4] Accepting request 96001 from devel:openSUSE:Factory:for-legal - fix license to be in spdx.org format OBS-URL: https://build.opensuse.org/request/show/96001 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=7 --- xmlunit.changes | 5 +++++ xmlunit.spec | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xmlunit.changes b/xmlunit.changes index debd1eb..ad38e29 100644 --- a/xmlunit.changes +++ b/xmlunit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 8 13:54:49 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + ------------------------------------------------------------------- Thu Nov 4 11:44:42 UTC 2010 - mvyskocil@suse.cz diff --git a/xmlunit.spec b/xmlunit.spec index 6e4e270..a067440 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -1,7 +1,7 @@ # -# spec file for package xmlunit (Version 1.0) +# spec file for package xmlunit # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -17,24 +17,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define section free Name: xmlunit Version: 1.0 -Release: 1 +Release: 0 Summary: Provides classes to do asserts on XML -License: BSD +License: BSD-2-Clause +Group: Development/Libraries/Java Url: http://xmlunit.sourceforge.net/ Source0: http://download.sourceforge.net/xmlunit/xmlunit1.0.zip Source1: http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom Patch0: xmlunit-java5-enum.patch Patch1: xmlunit-no-javac-target.patch -BuildRequires: jpackage-utils -BuildRequires: java-devel BuildRequires: ant BuildRequires: ant-junit BuildRequires: ant-trax +BuildRequires: java-devel +BuildRequires: jpackage-utils BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-jaxp-1.3-apis @@ -45,7 +45,6 @@ Requires: junit Requires: xalan-j2 Requires: xml-commons-jaxp-1.3-apis Requires: xerces-j2 -Group: Development/Libraries/Java BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): jpackage-utils >= 1.7.3 @@ -58,7 +57,6 @@ documents against a DTD, and (from v0.5) compares the results of XPath expressions. %package javadoc -License: BSD Summary: Javadoc for %{name} Group: Documentation/HTML From f101dd611b4239197ce58b7e356a4c762310873dd940aa65dba7f2ea6e89ddf0 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Thu, 15 Dec 2011 11:29:40 +0000 Subject: [PATCH 4/4] - fix the license to BSD-3-Clause (bnc#737022) OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=8 --- xmlunit.changes | 5 +++++ xmlunit.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xmlunit.changes b/xmlunit.changes index ad38e29..7b5bce4 100644 --- a/xmlunit.changes +++ b/xmlunit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 15 11:29:10 UTC 2011 - mvyskocil@suse.cz + +- fix the license to BSD-3-Clause (bnc#737022) + ------------------------------------------------------------------- Thu Dec 8 13:54:49 UTC 2011 - coolo@suse.com diff --git a/xmlunit.spec b/xmlunit.spec index a067440..d5b6c2c 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -17,13 +17,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define section free Name: xmlunit Version: 1.0 Release: 0 Summary: Provides classes to do asserts on XML -License: BSD-2-Clause +License: BSD-3-Clause Group: Development/Libraries/Java Url: http://xmlunit.sourceforge.net/ Source0: http://download.sourceforge.net/xmlunit/xmlunit1.0.zip