From 3f1564cc3317491fc0685b230fecccf63d67c31363bb3df2a0f897a2aef1bff1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Nov 2022 10:44:24 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=15 --- apache-sshd.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 57b8e6c..659f79d 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -30,6 +30,8 @@ Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch Patch1: apache-sshd-javadoc.patch BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: mvn(io.netty:netty-handler) +BuildRequires: mvn(io.netty:netty-transport) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -42,8 +44,11 @@ BuildRequires: mvn(org.apache:apache-jar-resource-bundle) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) +BuildRequires: mvn(org.c02e.jpgpj:jpgpj) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.eclipse.jgit:org.eclipse.jgit) +BuildRequires: mvn(org.eclipse.jgit:org.eclipse.jgit.pgm) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch @@ -67,20 +72,18 @@ This package provides %{name}. rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix +%pom_remove_dep -r tomcat:tomcat-apr + # Avoid unnecessary dep on spring framework %pom_remove_dep :spring-framework-bom %pom_remove_dep :testcontainers-bom sshd-sftp sshd-core # Build the core modules only -%pom_disable_module assembly %pom_disable_module sshd-mina -%pom_disable_module sshd-netty -%pom_disable_module sshd-ldap -%pom_disable_module sshd-git -%pom_disable_module sshd-contrib +%pom_remove_dep -r org.apache.sshd:sshd-mina %pom_disable_module sshd-spring-sftp -%pom_disable_module sshd-cli -%pom_disable_module sshd-openpgp +%pom_remove_dep -r org.apache.sshd:sshd-spring-sftp +%pom_disable_module assembly # Disable plugins we don't need for RPM builds %pom_remove_plugin :apache-rat-plugin From eb60ce7fc60f4bf4a39d51cef994284cc8fc9fdc6c4f5f80ee08359f8c54778f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Nov 2022 10:48:49 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=16 --- apache-sshd.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-sshd.spec b/apache-sshd.spec index 659f79d..a22ab5a 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -30,8 +30,6 @@ Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch Patch1: apache-sshd-javadoc.patch BuildRequires: fdupes BuildRequires: maven-local -BuildRequires: mvn(io.netty:netty-handler) -BuildRequires: mvn(io.netty:netty-transport) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -44,11 +42,8 @@ BuildRequires: mvn(org.apache:apache-jar-resource-bundle) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) -BuildRequires: mvn(org.c02e.jpgpj:jpgpj) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.eclipse.jgit:org.eclipse.jgit) -BuildRequires: mvn(org.eclipse.jgit:org.eclipse.jgit.pgm) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch @@ -71,7 +66,6 @@ This package provides %{name}. %patch1 -p1 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix - %pom_remove_dep -r tomcat:tomcat-apr # Avoid unnecessary dep on spring framework @@ -81,8 +75,14 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Build the core modules only %pom_disable_module sshd-mina %pom_remove_dep -r org.apache.sshd:sshd-mina +%pom_disable_module sshd-netty +%pom_disable_module sshd-ldap +%pom_disable_module sshd-git +%pom_disable_module sshd-contrib %pom_disable_module sshd-spring-sftp %pom_remove_dep -r org.apache.sshd:sshd-spring-sftp +%pom_disable_module sshd-cli +%pom_disable_module sshd-openpgp %pom_disable_module assembly # Disable plugins we don't need for RPM builds From 63c8b119b4360569c4bb4077c48aaa53e6cd0d813ab1f821b997b13428a8c494 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Feb 2023 07:26:56 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-sshd?expand=0&rev=17 --- apache-sshd.changes | 5 +++++ apache-sshd.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-sshd.changes b/apache-sshd.changes index 551e598..eb64057 100644 --- a/apache-sshd.changes +++ b/apache-sshd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 10 07:26:34 UTC 2023 - Fridrich Strba + +- Clean-up the spec a bit + ------------------------------------------------------------------- Wed Nov 16 11:36:21 UTC 2022 - Fridrich Strba diff --git a/apache-sshd.spec b/apache-sshd.spec index a22ab5a..1aec435 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ # # spec file for package apache-sshd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed