rpm/xmlgraphics-commons
SHA256
1
0
Fork 0
forked from pool/xmlgraphics-commons
Code Pull Requests Activity

Accepting request 527229 from Java:packages

Browse Source 
Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/527229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-commons?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2017-09-20 15:10:22 +00:00 committed by Git OBS Bridge
commit 18f14ae952
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xmlgraphics-commons.changes
View File

@ -1,7 +1,12 @@
-------------------------------------------------------------------
Tue Sep 19 07:32:15 UTC 2017 - fstrba@suse.com
- Fix build with jdk9: specify java source and target level 1.6
-------------------------------------------------------------------
Fri May 19 11:03:58 UTC 2017 - vsistek@suse.com
- Add BuildRequires: javapackages-local (for maven conversions)
- Add BuildRequires: javapackages-local (for maven conversions)
-------------------------------------------------------------------
Mon Mar 20 15:20:21 UTC 2017 - sknorr@suse.com

9
xmlgraphics-commons.spec
View File

@ -30,6 +30,7 @@ BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit
BuildRequires: apache-commons-io >= 1.1
BuildRequires: apache-commons-logging
BuildRequires: fdupes
BuildRequires: gpg2
# Needed for maven conversions
BuildRequires: javapackages-local
@ -54,8 +55,7 @@ Summary: Javadoc for %{name}
Group: Documentation/HTML
%description javadoc
%{summary}.
Javadoc for package %{name}.
%prep
%setup -q %{name}-%{version}
@ -69,7 +69,7 @@ pushd lib
ln -sf $(build-classpath commons-io) .
ln -sf $(build-classpath commons-logging) .
popd
ant package javadocs maven-artifacts
ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs maven-artifacts
%install
install -Dpm 644 build/%{name}-%{version}.jar \
@ -83,11 +83,11 @@ install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
#
install -dm 755 %{buildroot}%{_docdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc LICENSE
%{_javadir}/%{name}.jar
%{_mavenpomdir}/*
@ -98,7 +98,6 @@ install -dm 755 %{buildroot}%{_docdir}/%{name}
%endif
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog