Hello community, here is the log from the commit of package jsch for openSUSE:Factory checked in at 2020-04-09 23:14:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jsch (Old) and /work/SRC/openSUSE:Factory/.jsch.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jsch" Thu Apr 9 23:14:33 2020 rev:23 rq:792006 version:0.1.55 Changes: -------- --- /work/SRC/openSUSE:Factory/jsch/jsch.changes 2019-09-25 07:47:02.478742017 +0200 +++ /work/SRC/openSUSE:Factory/.jsch.new.3248/jsch.changes 2020-04-09 23:14:37.242215570 +0200 @@ -1,0 +2,14 @@ +Tue Apr 7 13:56:09 UTC 2020 - Fridrich Strba <[email protected]> + +- Version 0.1.55 + +------------------------------------------------------------------- +Tue Apr 7 13:52:31 UTC 2020 - Fridrich Strba <[email protected]> + +- Added patch: + * jsch-osgi-manifest.patch + + create the osgi manifest during the ant build + + replaces the MANIFEST.MF file +- Miscellaneous clean-up + +------------------------------------------------------------------- Old: ---- MANIFEST.MF jsch-0.1.54.pom jsch-0.1.54.zip New: ---- jsch-0.1.55.pom jsch-0.1.55.zip jsch-osgi-manifest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jsch.spec ++++++ --- /var/tmp/diff_new_pack.CYPy4z/_old 2020-04-09 23:14:37.958215984 +0200 +++ /var/tmp/diff_new_pack.CYPy4z/_new 2020-04-09 23:14:37.962215986 +0200 @@ -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,7 +64,8 @@ %prep %setup -q %patch0 -p1 -cp %{SOURCE3} pom.xml +%patch1 -p1 +cp %{SOURCE1} pom.xml %pom_remove_parent %build @@ -73,45 +74,34 @@ %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 ++++++ jsch-0.1.54.pom -> jsch-0.1.55.pom ++++++ --- /work/SRC/openSUSE:Factory/jsch/jsch-0.1.54.pom 2017-02-16 16:43:36.254299394 +0100 +++ /work/SRC/openSUSE:Factory/.jsch.new.3248/jsch-0.1.55.pom 2020-04-09 23:14:37.066215469 +0200 @@ -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> ++++++ jsch-osgi-manifest.patch ++++++ --- 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>
