Accepting request 653658 from Java:packages

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/653658
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlunit?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2018-12-04 19:56:13 +00:00 committed by Git OBS Bridge
commit 00ae407763
2 changed files with 24 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 7 20:46:02 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Do not depend on a particular xml-commons-apis provider.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 19 07:20:04 UTC 2017 - fstrba@suse.com Tue Sep 19 07:20:04 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package xmlunit # spec file for package xmlunit
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2008, JPackage Project # Copyright (c) 2000-2008, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -23,7 +23,7 @@ Release: 0
Summary: Provides classes to do asserts on XML Summary: Provides classes to do asserts on XML
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://xmlunit.sourceforge.net/ URL: http://xmlunit.sourceforge.net/
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
BuildRequires: ant BuildRequires: ant
@ -36,11 +36,11 @@ BuildRequires: junit
BuildRequires: unzip BuildRequires: unzip
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: xerces-j2 BuildRequires: xerces-j2
BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xml-commons-apis >= 1.3
Requires: junit Requires: junit
Requires: xalan-j2 Requires: xalan-j2
Requires: xerces-j2 Requires: xerces-j2
Requires: xml-commons-jaxp-1.3-apis Requires: xml-commons-apis >= 1.3
BuildArch: noarch BuildArch: noarch
%description %description
@ -82,7 +82,8 @@ ant -Djavac.source=1.6 -Djavac.target=1.6 -Dbuild.compiler=modern -Dhaltonfailur
%install %install
mkdir -p %{buildroot}%{_javadir} mkdir -p %{buildroot}%{_javadir}
install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir}/ && ln -s %{name}-%{version}.jar %{name}.jar)
# Javadoc # Javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_javadocdir}/%{name}
@ -91,15 +92,20 @@ cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
# poms # poms
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -m 644 build/lib/%{name}-%{version}.pom \ install -m 644 %{SOURCE1} \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
%add_maven_depmap %add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
%files %files
%doc README.txt LICENSE.txt %license LICENSE.txt
%{_javadir}/%{name}.jar %doc README.txt
%{_mavenpomdir}/JPP-%{name}.pom %{_javadir}/*.jar
%{_datadir}/maven-metadata/%{name}.xml %{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files javadoc %files javadoc
%doc userguide %doc userguide