Accepting request 533056 from Java:packages

Condition correctly the maven defines

OBS-URL: https://build.opensuse.org/request/show/533056
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-fop?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2017-10-16 23:51:25 +00:00 committed by Git OBS Bridge
commit a0a69714e4
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 29 06:57:25 UTC 2017 - fstrba@suse.com
- Don't condition the maven defines on release version, but on
_maven_repository being defined
-------------------------------------------------------------------
Tue Sep 19 07:23:59 UTC 2017 - fstrba@suse.com

View File

@ -46,7 +46,7 @@ BuildRequires: apache-pdfbox
BuildRequires: avalon-framework
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gpg2
BuildRequires: java-devel >= 1.6.0
BuildRequires: java-devel-openjdk >= 1.8.0.121
# Needed for maven conversions
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
@ -189,10 +189,10 @@ popd
%{_javadir}/%{name}.jar
%{_datadir}/%{name}
%{_mavenpomdir}/*
%if 0%{?suse_version} >= 1330
%{_datadir}/maven-metadata/%{name}.xml*
%else
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%{_mandir}/man1/*
%config(noreplace) %{_sysconfdir}/fop.xconf