Accepting request 631992 from Java:packages

- Do not run target  maven_artifacts as it just copies file from a->b
  and fails with newer ant

- Update to version 2.3:
  * no changelog available

OBS-URL: https://build.opensuse.org/request/show/631992
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-commons?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2018-09-03 08:33:20 +00:00 committed by Git OBS Bridge
commit 9afc3ff54e
4 changed files with 21 additions and 9 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbf7c12647f8b39604742f13418711edfe89021c83f683e1a66e54d71c17891a
size 2711469

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43f0419ac027dcdc5d6ee684482234b87e57694d9e15d5d4b26f0fc588128328
size 2716847

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Aug 28 13:44:48 UTC 2018 - tchvatal@suse.com
- Do not run target maven_artifacts as it just copies file from a->b
and fails with newer ant
-------------------------------------------------------------------
Tue Aug 28 13:12:00 UTC 2018 - tchvatal@suse.com
- Update to version 2.3:
* no changelog available
-------------------------------------------------------------------
Fri Dec 22 13:37:24 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package xmlgraphics-commons
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2008, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -18,12 +18,12 @@
Name: xmlgraphics-commons
Version: 2.1
Version: 2.3
Release: 0
Summary: XML Graphics Commons
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://xmlgraphics.apache.org/
URL: http://xmlgraphics.apache.org/
Source0: http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
Patch0: xmlgraphics-commons-build_xml.patch
Patch1: xmlgraphics-commons-jdk10.patch
@ -71,7 +71,7 @@ pushd lib
ln -sf $(build-classpath commons-io) .
ln -sf $(build-classpath commons-logging) .
popd
ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs maven-artifacts
ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs
%install
install -Dpm 644 build/%{name}-%{version}.jar \
@ -80,7 +80,7 @@ install -Dpm 644 build/%{name}-%{version}.jar \
#
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@ -90,7 +90,7 @@ cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
install -dm 755 %{buildroot}%{_docdir}/%{name}
%files
%doc LICENSE
%license LICENSE
%{_javadir}/%{name}.jar
%{_mavenpomdir}/*
%if %{defined _maven_repository}