11
0
Stephan Kulow
2019-02-06 14:46:35 +00:00
committed by Git OBS Bridge
2 changed files with 23 additions and 17 deletions

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Feb 1 16:34:45 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- BuildIgnore xml-apis and xml-resolver, since this does not
strictly require them for build
-------------------------------------------------------------------
Fri Feb 1 12:54:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- BuildIgnore xerces-j2 to break cycle of OSGi requires
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 13 10:47:17 UTC 2018 - Fridrich Strba <fstrba@suse.com> Thu Dec 13 10:47:17 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package xml-commons-apis # spec file for package xml-commons-apis
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -37,19 +37,20 @@ BuildRequires: fdupes
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: xz BuildRequires: xz
#!BuildIgnore: xerces-j2 xml-apis xml-resolver
Requires: apache-parent Requires: apache-parent
Conflicts: xml-commons-apis-bootstrap Conflicts: xml-commons-apis-bootstrap
Provides: xml-commons-jaxp-1.4-apis
Provides: xml-commons-jaxp-1.3-apis
Provides: xml-commons-jaxp-1.2-apis
Provides: xml-commons-jaxp-1.1-apis
Provides: xerces-j2-xml-apis Provides: xerces-j2-xml-apis
Provides: xml-apis = %{name}-%{release} Provides: xml-apis = %{version}-%{release}
Obsoletes: xml-commons-jaxp-1.4-apis Provides: xml-commons-jaxp-1.1-apis
Obsoletes: xml-commons-jaxp-1.3-apis Provides: xml-commons-jaxp-1.2-apis
Obsoletes: xml-commons-jaxp-1.2-apis Provides: xml-commons-jaxp-1.3-apis
Obsoletes: xml-commons-jaxp-1.1-apis Provides: xml-commons-jaxp-1.4-apis
Obsoletes: xerces-j2-xml-apis Obsoletes: xerces-j2-xml-apis
Obsoletes: xml-commons-jaxp-1.1-apis
Obsoletes: xml-commons-jaxp-1.2-apis
Obsoletes: xml-commons-jaxp-1.3-apis
Obsoletes: xml-commons-jaxp-1.4-apis
BuildArch: noarch BuildArch: noarch
%description %description
@@ -129,16 +130,10 @@ cp -a build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}
rm -rf build/docs/javadoc rm -rf build/docs/javadoc
%fdupes -s build/docs/ %fdupes -s build/docs/
%files %files -f .mfiles
%license LICENSE LICENSE.dom-documentation.txt LICENSE.dom-software.txt LICENSE.sac.html LICENSE.sax.txt %license LICENSE LICENSE.dom-documentation.txt LICENSE.dom-software.txt LICENSE.sac.html LICENSE.sax.txt
%doc NOTICE README.dom.txt README-sax README.sax.txt %doc NOTICE README.dom.txt README-sax README.sax.txt
%{_javadir}/* %{_javadir}/*
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files manual %files manual
%doc build/docs/* %doc build/docs/*