Accepting request 533048 from Java:packages

Condition correctly the maven defines

OBS-URL: https://build.opensuse.org/request/show/533048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-collections?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2017-10-16 23:51:04 +00:00 committed by Git OBS Bridge
commit e4a78bc13d
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 29 08:12:33 UTC 2017 - fstrba@suse.com
- Don't condition the maven defines on release version, but on
_maven_repository being defined
-------------------------------------------------------------------
Thu Sep 14 11:07:55 UTC 2017 - fstrba@suse.com

View File

@ -146,10 +146,10 @@ cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframewo
%{_javadir}/%{name}-testframework.jar
%{_javadir}/%{short_name}-testframework.jar
%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
%if %{?suse_version} > 1320
%{_datadir}/maven-metadata/%{name}-testframework.xml
%else
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/%{name}-testframework
%else
%{_datadir}/maven-metadata/%{name}-testframework.xml
%endif
%files javadoc