Fridrich Strba 2019-04-08 11:37:31 +00:00 committed by Git OBS Bridge
parent 8c67cbb868
commit 01ce8526d4
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 8 11:37:06 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Do not depend on the apache-parent, since we are not building
using Maven.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 1 16:34:45 UTC 2019 - Fridrich Strba <fstrba@suse.com> Fri Feb 1 16:34:45 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -32,13 +32,11 @@ Source2: %{name}-ext-MANIFEST.MF
Source3: http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom Source3: http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
Source4: http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom Source4: http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-parent
BuildRequires: fdupes 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 #!BuildIgnore: xerces-j2 xml-apis xml-resolver
Requires: apache-parent
Conflicts: xml-commons-apis-bootstrap Conflicts: xml-commons-apis-bootstrap
Provides: xerces-j2-xml-apis Provides: xerces-j2-xml-apis
Provides: xml-apis = %{version}-%{release} Provides: xml-apis = %{version}-%{release}
@ -87,6 +85,8 @@ iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \
cp %{SOURCE3} %{SOURCE4} . cp %{SOURCE3} %{SOURCE4} .
sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
%pom_remove_parent xml-apis-ext*.pom
%build %build
ant -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadoc ant -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadoc