diff --git a/apache-sshd.spec b/apache-sshd.spec index 60515b2..321fc3e 100644 --- a/apache-sshd.spec +++ b/apache-sshd.spec @@ -1,7 +1,7 @@ Epoch: 1 Name: apache-sshd Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache SSHD # One file has ISC licensing: @@ -11,6 +11,7 @@ URL: http://mina.apache.org/sshd-project Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz +# Avoid optional dep on tomcat native APR library Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch BuildRequires: maven-local @@ -76,19 +77,23 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true" . %build -# tests require ch.ethz.ganymed:ganymed-ssh2 +# Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2 %mvn_build -f -- -Dworkspace.root.dir=$(pwd) %install %mvn_install %files -f .mfiles +%doc CHANGES.md %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %files javadoc -f .mfiles-javadoc %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %changelog +* Mon Dec 02 2019 Mat Booth - 1:2.2.0-3 +- Include release notes in %%doc section + * Mon Jul 01 2019 Mat Booth - 1:2.2.0-2 - Fix license tag to include ISC for bcrypt implementation