diff --git a/xml-commons-resolver.changes b/xml-commons-resolver.changes index 640fd65..e9f1dc5 100644 --- a/xml-commons-resolver.changes +++ b/xml-commons-resolver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 1 12:59:05 UTC 2019 - Fridrich Strba + +- BuildIgnore xerces-j2 to break cycle of OSGi requires + ------------------------------------------------------------------- Thu Dec 13 10:52:02 UTC 2018 - Fridrich Strba diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 89d53b0..8ddd886 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ # # spec file for package xml-commons-resolver # -# 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 # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ BuildRequires: apache-parent BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local +#!BuildIgnore: xerces-j2 Requires: apache-parent # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions @@ -114,7 +115,7 @@ install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1 install -d -m 755 %{buildroot}%{resolverdir} install -m 0644 %{SOURCE10} %{buildroot}%{resolverdir}/CatalogManager.properties -%files +%files -f .mfiles %license LICENSE.resolver.txt %doc KEYS NOTICE-resolver.txt %{_mandir}/man1/* @@ -122,12 +123,6 @@ install -m 0644 %{SOURCE10} %{buildroot}%{resolverdir}/CatalogManager.properties %config(noreplace) %{resolverdir}/* %dir %{resolverdir} %{_javadir}/* -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %files javadoc %license LICENSE.resolver.txt