From faa4546c5879356ff9f234c4823009fab139b12a6691b881047303067265d9fe Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2017 08:11:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-codec?expand=0&rev=31 --- apache-commons-codec.changes | 6 ++++++ apache-commons-codec.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-commons-codec.changes b/apache-commons-codec.changes index 87a82c1..cd0139d 100644 --- a/apache-commons-codec.changes +++ b/apache-commons-codec.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 29 08:11:16 UTC 2017 - fstrba@suse.com + +- Don't condition the maven defines on release version, but on + _maven_repository being defined + ------------------------------------------------------------------- Thu Sep 7 11:59:41 UTC 2017 - fstrba@suse.com diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 49e382c..bb3a9ba 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -127,10 +127,10 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %doc LICENSE.txt RELEASE-NOTES.txt %{_javadir}/*.jar %{_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