Accepting request 792006 from Java:packages
0.1.54 -> 0.1.55 OBS-URL: https://build.opensuse.org/request/show/792006 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jsch?expand=0&rev=23
This commit is contained in:
commit
b12d685269
15
MANIFEST.MF
15
MANIFEST.MF
@ -1,15 +0,0 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %bundleName
|
||||
Bundle-SymbolicName: com.jcraft.jsch
|
||||
Bundle-Version: 0.1.51
|
||||
Bundle-Vendor: %venderName
|
||||
Bundle-Localization: plugin
|
||||
Export-Package: com.jcraft.jsch;version="0.1.51",
|
||||
com.jcraft.jsch.jce;version="0.1.51";x-internal:=true,
|
||||
com.jcraft.jsch.jcraft;version="0.1.51";x-internal:=true,
|
||||
com.jcraft.jsch.jgss;version="0.1.51";x-internal:=true
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
Created-By: 1.4.0 (Sun Microsystems Inc.)
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ab71e1e5ff665213b7d892ebd0829b3da835538a73409fe11bb006ec5b6b3909
|
||||
size 365455
|
@ -4,7 +4,7 @@
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>0.1.54</version>
|
||||
<version>0.1.55</version>
|
||||
<name>JSch</name>
|
||||
<url>http://www.jcraft.com/jsch/</url>
|
||||
<description>JSch is a pure Java implementation of SSH2</description>
|
3
jsch-0.1.55.zip
Normal file
3
jsch-0.1.55.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:063bf66e163f43b7d7897ac14efe1e80ed094d4016afe1181fe2285e3797bed3
|
||||
size 369664
|
23
jsch-osgi-manifest.patch
Normal file
23
jsch-osgi-manifest.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- jsch-0.1.54/build.xml 2016-08-30 09:06:39.000000000 +0200
|
||||
+++ jsch-0.1.54/build.xml 2020-04-07 15:40:40.461145903 +0200
|
||||
@@ -50,9 +50,7 @@
|
||||
|
||||
<!-- Put everything in ${build} into the MyProject-${version}.jar file -->
|
||||
<jar jarfile="${dist}/lib/jsch-${version}.jar" basedir="${build}">
|
||||
- <!--
|
||||
<manifest>
|
||||
- <attribute name="Bundle-ClassPath" value="."/>
|
||||
<attribute name="Bundle-Vendor" value="JCraft, Inc."/>
|
||||
<attribute name="Bundle-Name" value="com.jcraft.jsch"/>
|
||||
<attribute name="Bundle-ManifestVersion" value="2"/>
|
||||
@@ -60,8 +58,8 @@
|
||||
<attribute name="Bundle-Version" value="${version}"/>
|
||||
<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'/>
|
||||
- <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib"/>
|
||||
+ <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib;resolution:=optional"/>
|
||||
+ <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))""/>
|
||||
</manifest>
|
||||
- -->
|
||||
</jar>
|
||||
</target>
|
||||
|
14
jsch.changes
14
jsch.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 7 13:56:09 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Version 0.1.55
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 7 13:52:31 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* jsch-osgi-manifest.patch
|
||||
+ create the osgi manifest during the ant build
|
||||
+ replaces the MANIFEST.MF file
|
||||
- Miscellaneous clean-up
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 20 13:37:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
56
jsch.spec
56
jsch.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package jsch
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,25 +17,25 @@
|
||||
|
||||
|
||||
Name: jsch
|
||||
Version: 0.1.54
|
||||
Version: 0.1.55
|
||||
Release: 0
|
||||
Summary: Pure Java implementation of SSH2
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/Java
|
||||
Url: http://www.jcraft.com/jsch/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip
|
||||
Source1: MANIFEST.MF
|
||||
URL: https://www.jcraft.com/jsch/
|
||||
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip
|
||||
Source1: https://repo1.maven.org/maven2/com/jcraft/%{name}/%{version}/%{name}-%{version}.pom
|
||||
Source2: plugin.properties
|
||||
Source3: http://repo1.maven.org/maven2/com/jcraft/%{name}/%{version}/%{name}-%{version}.pom
|
||||
Patch0: jsch-0.1.54-sourcetarget.patch
|
||||
Patch1: jsch-osgi-manifest.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: jzlib
|
||||
BuildRequires: unzip
|
||||
BuildRequires: zip
|
||||
Requires: jzlib
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -64,8 +64,9 @@ functionality into your own Java programs.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
cp %{SOURCE3} pom.xml
|
||||
%pom_remove_parent
|
||||
%patch1 -p1
|
||||
cp %{SOURCE1} pom.xml
|
||||
%pom_remove_parent
|
||||
|
||||
%build
|
||||
export CLASSPATH=$(build-classpath jzlib)
|
||||
@ -73,45 +74,34 @@ ant dist javadoc
|
||||
|
||||
%install
|
||||
# inject the OSGi Manifest
|
||||
mkdir META-INF
|
||||
cp %{SOURCE1} META-INF
|
||||
cp %{SOURCE2} plugin.properties
|
||||
zip dist/lib/%{name}-*.jar META-INF/MANIFEST.MF
|
||||
zip dist/lib/%{name}-*.jar plugin.properties
|
||||
jar uf dist/lib/%{name}-*.jar plugin.properties
|
||||
|
||||
# jars
|
||||
install -Dpm 644 dist/lib/%{name}-*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
||||
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
install -Dpm 644 dist/lib/%{name}-*.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar
|
||||
|
||||
# javadoc
|
||||
install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
||||
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
# examples
|
||||
install -dm 755 %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr examples/* %{buildroot}%{_datadir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_datadir}/%{name}
|
||||
|
||||
# POM and depmap
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%add_maven_depmap
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE.txt
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{name}-%{version}.jar
|
||||
%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%{_datadir}/maven-metadata/%{name}.xml
|
||||
%files -f .mfiles
|
||||
%license LICENSE.txt
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%files demo
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user