OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=27

2020-04-07 13:53:37 +00:00 · 2020-04-07 13:53:37 +00:00 · 3bfe2b3a46
commit 3bfe2b3a46
parent 20dbc0cf62
4 changed files with 53 additions and 47 deletions
--- a/MANIFEST.MF
+++ b/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.)
-
-
--- a/jsch-osgi-manifest.patch
+++ b/jsch-osgi-manifest.patch
@ -0,0 +1,22 @@
+--- 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="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
+       </manifest>
+-      -->
+     </jar>
+   </target>
+ 
--- a/jsch.changes
+++ b/jsch.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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>

--- a/jsch.spec
+++ b/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
@ -22,20 +22,20 @@ 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