From beac425be7f4e33e66f91d0175bc3e142acc83756dd79bf6d60941c9eab161ab Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2017 08:12:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=21 --- apache-commons-collections.changes | 6 ++++++ apache-commons-collections.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-commons-collections.changes b/apache-commons-collections.changes index 01aa840..6781cca 100644 --- a/apache-commons-collections.changes +++ b/apache-commons-collections.changes @@ -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 diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 1d42e88..47db09e 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -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