From defb3a1b848ac183234a0e31874f69265aacf702 Mon Sep 17 00:00:00 2001 From: xiaoji <345865759@163.com> Date: Tue, 21 Jan 2025 18:42:01 +0800 Subject: [PATCH 1/3] updated to 3.5.1 --- mariadb-java-client.spec | 68 ++++++++++++++-------------------------- sources | 2 +- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec index 67c9166..f037e97 100644 --- a/mariadb-java-client.spec +++ b/mariadb-java-client.spec @@ -1,78 +1,56 @@ Summary: A lightweight JDBC connector for use with MariaDB and MySQL database servers Name: mariadb-java-client -Version: 3.1.2 -Release: 5%{?dist} +Version: 3.5.1 +Release: 1%{?dist} License: BSD and LGPLv2+ URL: https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ Source0: https://github.com/mariadb-corporation/mariadb-connector-j/archive/refs/tags/%{version}.tar.gz - Patch3000: remove_waffle-jna.patch - -BuildRequires: maven-local -BuildRequires: mvn(net.java.dev.jna:jna) -BuildRequires: mvn(net.java.dev.jna:jna-platform) -BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.osgi:osgi.core) +BuildRequires: java-devel +BuildRequires: maven-buildrequires BuildArch: noarch ExclusiveArch: %{java_arches} noarch +Requires: java-headless +Requires: javapackages-filesystem +Requires: jna %description MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases using the standard JDBC API. The library is LGPL licensed. + + %prep %autosetup -n mariadb-connector-j-%{version} -p1 -%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 -%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 -%pom_add_dep org.slf4j:slf4j-api -%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 -sed -i '/aws/d' src/main/java9/module-info.java -sed -i '/waffle/d' src/main/java9/module-info.java -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 +%build +JAVA_HOME=/usr/lib/jvm/java PATH="/usr/lib/jvm/java/bin:${PATH}" ~/.local/apache-maven-3.9.9/bin/mvn -o -Dmaven.repo.local=/usr/lib/maven/repository/ -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package -rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsNativeSspiAuthentication.java -%mvn_file org.mariadb.jdbc:%{name} %{name} -%mvn_alias org.mariadb.jdbc:%{name} mariadb:mariadb-connector-java -%pom_remove_plugin org.jacoco:jacoco-maven-plugin -%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin -%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin -%pom_remove_plugin com.coveo:fmt-maven-plugin -%pom_remove_plugin -r :maven-gpg-plugin -%pom_remove_plugin -r :maven-javadoc-plugin +%install +mkdir -p %{buildroot}/usr/lib/java/ +cp target/mariadb-java-client-%{version}.jar %{buildroot}/usr/lib/java/mariadb-java-client.jar -%build -%mvn_build -f -j -%install -%mvn_install -%files -f .mfiles +%files %license LICENSE %doc README.md +/usr/lib/java/mariadb-java-client.jar + + %changelog +* Tue Jan 21 2025 Zhao Zhen - 3.5.1-1 +- rewrite build script +- updated to upstream 3.5.1 +- lack .pom amd .xml files + * Thu Sep 26 2024 OpenCloudOS Release Engineering - 3.1.2-5 - Rebuilt for clarifying the packages requirement in BaseOS and AppStream diff --git a/sources b/sources index 922df04..b302e7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.1.2.tar.gz) = c762bada08dda435feb3a792a6b5abae7c95840cefe72f7fef02e799cab1380f4197a2b19ce9b09844d89f10b9f2ad33879fb138849cd02fdc27c1dd67a9b5c9 +SHA512 (3.5.1.tar.gz) = b1633c1a0c561773ebe8b88f7dd5f6549ce870e07e9dca43a72698dba13cd7af05ae7dcff3b80724d9e0d212864e4ca59ae200cb87b5fc5cec2dbf33c174fd11 -- Gitee From 7839168461e584aeaa116b073001d3ab762b3d12 Mon Sep 17 00:00:00 2001 From: xiaoji Date: Thu, 23 Jan 2025 11:02:30 +0800 Subject: [PATCH 2/3] small fix --- mariadb-java-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec index f037e97..52d2272 100644 --- a/mariadb-java-client.spec +++ b/mariadb-java-client.spec @@ -28,7 +28,7 @@ The library is LGPL licensed. %build -JAVA_HOME=/usr/lib/jvm/java PATH="/usr/lib/jvm/java/bin:${PATH}" ~/.local/apache-maven-3.9.9/bin/mvn -o -Dmaven.repo.local=/usr/lib/maven/repository/ -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package +JAVA_HOME=/usr/lib/jvm/java PATH="/usr/lib/jvm/java/bin:${PATH}" mvn -o -Dmaven.repo.local=/usr/lib/maven/repository/ -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package -- Gitee From 9a62b974d2a5ff8e0278f5d6c78208b421fa70d9 Mon Sep 17 00:00:00 2001 From: xiaoji <345865759@163.com> Date: Fri, 24 Jan 2025 08:46:11 +0800 Subject: [PATCH 3/3] small fix --- mariadb-java-client.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec index 52d2272..413082a 100644 --- a/mariadb-java-client.spec +++ b/mariadb-java-client.spec @@ -7,6 +7,7 @@ URL: https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ Source0: https://github.com/mariadb-corporation/mariadb-connector-j/archive/refs/tags/%{version}.tar.gz Patch3000: remove_waffle-jna.patch BuildRequires: java-devel +BuildRequires: maven >= 3.9.9 BuildRequires: maven-buildrequires BuildArch: noarch -- Gitee