diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec index df47d55..f0e5437 100644 --- a/mariadb-java-client.spec +++ b/mariadb-java-client.spec @@ -1,6 +1,8 @@ +%global build_javadoc 0 + Name: mariadb-java-client Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Connects applications developed in Java to MariaDB and MySQL databases # added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13 License: BSD and LGPLv2+ @@ -25,16 +27,22 @@ BuildRequires: mvn(org.osgi:osgi.core) # since version 1.5.2 missing optional dependency (windows) #BuildRequires: mvn(com.github.dblock.waffle:waffle-jna) +%if %build_javadoc == 0 +Obsoletes: %{name}-javadoc < 3.0.3 +%endif + %description MariaDB Connector/J is a Type 4 JDBC driver, also known as the Direct to Database Pure Java Driver. It was developed specifically as a lightweight JDBC connector for use with MySQL and MariaDB database servers. +%if %build_javadoc %package javadoc Summary: Javadoc for %{name} %description javadoc This package contains the API documentation for %{name}. +%endif %prep %setup -qn mariadb-connector-j-%{version} @@ -82,8 +90,11 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN %pom_remove_plugin -r :maven-javadoc-plugin %build +%if %build_javadoc == 0 +opts="-j" +%endif # tests are skipped, while they require running application server -%mvn_build -f +%mvn_build -f $opts %install %mvn_install @@ -92,10 +103,15 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN %doc README.md %license LICENSE +%if %build_javadoc %files javadoc -f .mfiles-javadoc %license LICENSE +%endif %changelog +* Mon Jan 31 2022 Zuzana Miklankova - 3.0.3-2 +- Disable javadoc build, because xmvn is not able to build it + * Thu Jan 27 2022 Zuzana Miklankova - 3.0.3-1 - Rebase to version 3.0.3