Hello community, here is the log from the commit of package jzlib for openSUSE:Leap:15.2 checked in at 2020-02-05 07:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/jzlib (Old) and /work/SRC/openSUSE:Leap:15.2/.jzlib.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jzlib" Wed Feb 5 07:24:40 2020 rev:17 rq:762830 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/jzlib/jzlib.changes 2020-01-15 15:14:35.050214010 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.jzlib.new.26092/jzlib.changes 2020-02-05 07:24:40.854626988 +0100 @@ -1,0 +2,14 @@ +Mon Sep 23 07:20:13 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Build the jar file as an eclipse bundle +- Build and package the javadoc again +- Added patch: + * jzlib-javadoc-fixes.patch + + small fixes for javadoc tags + +------------------------------------------------------------------- +Sun Nov 25 17:24:33 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Install as maven artifact + +------------------------------------------------------------------- New: ---- jzlib-javadoc-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jzlib.spec ++++++ --- /var/tmp/diff_new_pack.U59YNY/_old 2020-02-05 07:24:41.222627143 +0100 +++ /var/tmp/diff_new_pack.U59YNY/_new 2020-02-05 07:24:41.226627145 +0100 @@ -1,7 +1,7 @@ # # spec file for package jzlib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,14 +22,15 @@ Summary: Re-implementation of zlib in pure Java License: BSD-3-Clause Group: Development/Libraries/Java -Url: http://www.jcraft.com/jzlib/ +URL: http://www.jcraft.com/jzlib/ Source0: https://github.com/ymnk/jzlib/archive/%{version}.tar.gz Source1: %{name}_build.xml +# This patch is sent upstream: https://github.com/ymnk/jzlib/pull/15 +Patch0: jzlib-javadoc-fixes.patch BuildRequires: ant >= 1.6 +BuildRequires: fdupes BuildRequires: java-devel -BuildRequires: javapackages-tools -Obsoletes: %{name}-javadoc -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: javapackages-local BuildArch: noarch %description @@ -40,14 +41,23 @@ (compression) and Mark Adler (decompression). %package demo -Summary: Re-implementation of zlib in pure Java +Summary: Examples for %{name} Group: Development/Libraries/Java +Requires: %{name} = %{version}-%{release} %description demo -Demo files for %{summary}. +%{summary}. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML + +%description javadoc +%{summary}. %prep %setup -q +%patch0 cp %{SOURCE1} build.xml # bnc#500524 @@ -55,26 +65,38 @@ rm misc/mindtermsrc-v121-compression.patch %build -ant \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ - dist +%{ant} jar javadoc %install # jar -install -Dpm 644 dist/lib/%{name}.jar \ +install -Dpm 644 target/%{name}-%{version}.jar \ %{buildroot}%{_javadir}/%{name}.jar +# pom +install -Dpm 644 pom.xml \ + %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar + # examples install -dm 755 %{buildroot}%{_datadir}/%{name}-%{version} cp -pr example/* %{buildroot}%{_datadir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_datadir}/%{name}-%{version} + +# javadoc +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir}/%{name} -%files +%files -f .mfiles %defattr(0644,root,root,0755) -%{_javadir}/%{name}.jar -%doc LICENSE.txt +%license LICENSE.txt %files demo %defattr(0644,root,root,0755) %doc %{_datadir}/%{name}-%{version} +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE.txt + %changelog ++++++ jzlib-javadoc-fixes.patch ++++++ --- src/main/java/com/jcraft/jzlib/ZStream.java.orig 2014-05-09 12:35:05.241400959 +0100 +++ src/main/java/com/jcraft/jzlib/ZStream.java 2014-05-09 12:35:35.093886286 +0100 @@ -371,6 +371,7 @@ /** * Those methods are expected to be override by Inflater and Deflater. * In the future, they will become abstract methods. + * @return an error code */ public int end(){ return Z_OK; } public boolean finished(){ return false; } --- src/main/java/com/jcraft/jzlib/GZIPHeader.java.orig 2014-05-09 12:37:35.358812069 +0100 +++ src/main/java/com/jcraft/jzlib/GZIPHeader.java 2014-05-09 12:37:40.267727366 +0100 @@ -37,7 +37,7 @@ import java.io.UnsupportedEncodingException; /** - * @see "http://www.ietf.org/rfc/rfc1952.txt"; + * See "http://www.ietf.org/rfc/rfc1952.txt"; */ public class GZIPHeader implements Cloneable { ++++++ jzlib_build.xml ++++++ --- /var/tmp/diff_new_pack.U59YNY/_old 2020-02-05 07:24:41.250627155 +0100 +++ /var/tmp/diff_new_pack.U59YNY/_new 2020-02-05 07:24:41.250627155 +0100 @@ -1,51 +1,113 @@ -<project name="Jzlib" default="dist" basedir="."> - <description> -JZlib is a re-implementation of zlib in pure Java. -The first and final aim for hacking this stuff is -to add the packet compression support to pure Java SSH systems. - </description> - <!-- set global properties for this build --> - <property name="src" location="src/main/java"/> - <property name="build" location="build"/> - <property name="dist" location="dist"/> - <property name="javadoc" location="javadoc"/> - <property name="javac.debug" value="false"/> - <path id="project.cp"> - <pathelement location="${build}"/> - </path> - <target name="init"> - <!-- Create the build directory structure used by compile --> - <mkdir dir="${build}"/> +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jzlib" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + + <property name="project.groupId" value="com.jcraft"/> + <property name="project.artifactId" value="jzlib"/> + <property name="project.version" value="1.1.3"/> + + <property name="compiler.source" value="1.6"/> + <property name="compiler.target" value="${compiler.source}"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> </target> - <target name="compile" depends="init" - description="compile the source " > - <!-- Compile the java code from ${src} into ${build} --> - <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}"> + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="true" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> </javac> </target> - <target name="dist" depends="compile" - description="generate the distribution" > - <!-- Create the distribution directory --> - <mkdir dir="${dist}/lib"/> - <!-- Put everything in ${build} into the jar file --> - <jar jarfile="${dist}/lib/jzlib.jar" basedir="${build}"/> - </target> + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> - <target name="clean" - description="clean up" > - <!-- Delete the ${build} and ${dist} directory trees --> - <delete dir="${build}"/> - <delete dir="${dist}"/> - <delete dir="${javadoc}"/> + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + source="${compiler.source}" + linksource="false" + breakiterator="false"/> </target> - <target name="javadoc"> - <javadoc sourcepath="${src}" - destdir="${javadoc}" - > - <packageset dir="${src}"/> - </javadoc> + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Bundle-Description" value="JZlib is a re-implementation of zlib in pure Java"/> + <attribute name="Bundle-DocURL" value="http://www.jcraft.com/"/> + <attribute name="Bundle-License" value="http://www.jcraft.com/jzlib/LICENSE.txt"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="JZlib"/> + <attribute name="Bundle-SymbolicName" value="com.jcraft.jzlib"/> + <attribute name="Bundle-Vendor" value="jcraft"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="com.jcraft.jzlib;version="${project.version}""/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + </project>
