Skip to content

Commit 776ee00

Browse files
authored
Build Fix: jsch 0.1.55 (#13709)
1 parent 4b9863b commit 776ee00

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

SPECS-EXTENDED/jsch/jsch-0.1.54-sourcetarget.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
destdir="${build}"
77
- target="1.4"
88
- source="1.4"
9-
+ target="1.6"
10-
+ source="1.6"
9+
+ target="1.8"
10+
+ source="1.8"
1111
debug="${javac.debug}">
1212
<classpath refid="lib.path.ref"/>
1313
<exclude name="com/jcraft/jsch/jcraft/Compression.java"

SPECS-EXTENDED/jsch/jsch-osgi-manifest.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<attribute name="Export-Package" value='com.jcraft.jsch;version="${version}",com.jcraft.jsch.jce;version="${version}";x-internal:=true,com.jcraft.jsch.jcraft;version="${version}";x-internal:=true,com.jcraft.jsch.jgss;version="${version}";x-internal:=true'/>
1616
- <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib"/>
1717
+ <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib;resolution:=optional"/>
18-
+ <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
18+
+ <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.8))&quot;"/>
1919
</manifest>
2020
- -->
2121
</jar>

SPECS-EXTENDED/jsch/jsch.spec

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Distribution: Azure Linux
2020

2121
Name: jsch
2222
Version: 0.1.55
23-
Release: 2%{?dist}
23+
Release: 3%{?dist}
2424
Summary: Pure Java implementation of SSH2
2525
License: BSD-3-Clause
2626
Group: Development/Libraries/Java
@@ -64,9 +64,7 @@ X11 forwarding, file transfer, etc., and you can integrate its
6464
functionality into your own Java programs.
6565

6666
%prep
67-
%setup -q
68-
%patch 0 -p1
69-
%patch 1 -p1
67+
%autosetup -p1
7068
cp %{SOURCE1} pom.xml
7169
%pom_remove_parent
7270

@@ -107,6 +105,10 @@ cp -pr examples/* %{buildroot}%{_datadir}/%{name}
107105
%{_datadir}/%{name}
108106

109107
%changelog
108+
* Thu May 08 2025 Archana Shettigar <v-shettigara@microsoft.com> - 0.1.55-3
109+
- Build fix
110+
- License verified
111+
110112
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1.55-2
111113
- Converting the 'Release' tag to the '[number].[distribution]' format.
112114

@@ -122,6 +124,7 @@ cp -pr examples/* %{buildroot}%{_datadir}/%{name}
122124
+ create the osgi manifest during the ant build
123125
+ replaces the MANIFEST.MF file
124126
- Miscellaneous clean-up
127+
125128
* Fri Sep 20 2019 Fridrich Strba <fstrba@suse.com>
126129
- Remove reference to the parent from pom file, since we are not
127130
building with maven

0 commit comments

Comments
 (0)