From 7c8c5b1b51b13c6ab3cfc6c349dd012e5da7e487dbb105903c9e6e079b20c730 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2017 06:41:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=14 --- apache-commons-cli.changes | 6 ++++++ apache-commons-cli.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-commons-cli.changes b/apache-commons-cli.changes index 156c564..c1ff8d6 100644 --- a/apache-commons-cli.changes +++ b/apache-commons-cli.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 29 06:41:14 UTC 2017 - fstrba@suse.com + +- Don't condition the maven defines on release version, but on + _maven_repository being defined + ------------------------------------------------------------------- Thu Sep 14 09:33:27 UTC 2017 - fstrba@suse.com diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index dc17a68..c79c4e0 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -87,10 +87,10 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt %{_javadir}/* %{_mavenpomdir}/* -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/%{name}.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml %endif %files javadoc