rpms/mariadb-java-client
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Synchronize with Fedora version

Browse Source 
Resolves: RHEL-38684
This commit is contained in:
Marián Konček 2024-08-12 18:43:25 +02:00
parent adfd1e346d
commit 6eb02a47a6
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mariadb-java-client.spec
View File

@ -1,8 +1,8 @@
%global build_javadoc 0
Name: mariadb-java-client
Version: 3.3.2
Release: 5%{?dist}
Version: 3.4.0
Release: 1%{?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: LGPL-2.1-only
@ -28,58 +28,53 @@ 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}
%setup -q -n mariadb-connector-j-%{version}
# remove missing optional dependency waffle-jna
%pom_remove_dep com.github.waffle:waffle-jna
%pom_remove_dep ch.qos.logback:logback-classic
%pom_remove_dep software.amazon.awssdk:bom
%pom_remove_dep software.amazon.awssdk:rds
%pom_remove_dep org.junit:junit-bom
%pom_remove_dep org.junit.jupiter:junit-jupiter-engine
%pom_remove_dep org.slf4j:slf4j-api
# used in buildtime for generating OSGI metadata
%pom_remove_plugin biz.aQute.bnd:bnd-maven-plugin
%pom_add_dep net.java.dev.jna:jna
%pom_add_dep net.java.dev.jna:jna-platform
# add slf4j dep again, this time not dependent on any specific version
# make the slf4j dependency version-independent
%pom_remove_dep org.slf4j:slf4j-api
%pom_add_dep org.slf4j:slf4j-api
# use latest OSGi implementation
# use the latest OSGi implementation
%pom_change_dep -r :org.osgi.core org.osgi:osgi.core
%pom_change_dep -r :org.osgi.compendium org.osgi:osgi.cmpn
rm -r src/main/java/org/mariadb/jdbc/plugin/credential/aws
# removing dependencies and 'provides', which mariadb-java-client cannot process from module-info.java
sed -i '/aws/d' src/main/java9/module-info.java
sed -i '/waffle/d' src/main/java9/module-info.java
# removing missing dependencies form META-INF, so that the mariadb-java-client module would be valid
sed -i '/aws/d' src/main/resources/META-INF/services/org.mariadb.jdbc.plugin.CredentialPlugin
sed -i '/aws/d' src/test/resources/META-INF/services/org.mariadb.jdbc.plugin.CredentialPlugin
# also remove the file using the removed plugin
rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsNativeSspiAuthentication.java
# patch the sources so that the missing file is not making trouble
%patch -P 0 -p1
%patch 0 -p1
%mvn_file org.mariadb.jdbc:%{name} %{name}
%mvn_alias org.mariadb.jdbc:%{name} mariadb:mariadb-connector-java
@ -91,11 +86,8 @@ 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 $opts
%mvn_build -f
%install
%mvn_install
@ -104,12 +96,13 @@ opts="-j"
%doc README.md
%license LICENSE
%if %build_javadoc
%files javadoc -f .mfiles-javadoc
%license LICENSE
%endif
%changelog
* Mon Aug 12 2024 Marián Konček <mkoncek@redhat.com> - 3.4.0-1
- Synchronize with Fedora version
* Fri Aug 09 2024 Marián Konček <mkoncek@redhat.com> - 3.3.2-5
- Rebuild without generated Requires

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-connector-j-3.3.2.tar.gz) = 287a201b741bc10a231ce465c3e60ee29fa8a9179c2ea9c9018bfe7e72ed2563eaed756f1e5f335fba730c19eb50ecd17e95421622eb8673a6a266ca99d15630
SHA512 (mariadb-connector-j-3.4.0.tar.gz) = 64676fd978d481888434aaa20214de1b7f94a5a8248e4c171e9e85b9d60940d51e038c902e0baf1c235b7488e0da332607ce2b6bd78f2199779492a0fce3cd77