From 3b93728b1b51df2c7c3ba8621b5710946473967c5fc570329b69e604ba73e80e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2017 06:45:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=46 --- mysql-connector-java.changes | 6 ++++++ mysql-connector-java.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index fe08aa0..26b32f1 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 29 06:45:22 UTC 2017 - fstrba@suse.com + +- Don't condition the maven defines on release version, but on + _maven_repository being defined + ------------------------------------------------------------------- Sun Sep 10 13:49:02 UTC 2017 - fstrba@suse.com diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 15a71d7..4a8b8c6 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -130,10 +130,10 @@ sed -i 's/>@.*%{version} 1320 -%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml* -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/* +%else +%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml* %endif %{_mavenpomdir}/*.pom