diff --git a/1.1.2.tar.gz b/1.1.2.tar.gz deleted file mode 100644 index ce4cd82..0000000 --- a/1.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11ba14089fb7dad16fa214d8f28d24abb92d6a3798fae9cc62a7f74565b3fcc2 -size 65549 diff --git a/1.1.3.tar.gz b/1.1.3.tar.gz new file mode 100644 index 0000000..7ff5049 --- /dev/null +++ b/1.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83da656205fe9cae8fc17aaff71237836acac582a88116c7579e362126bd0ec4 +size 139424 diff --git a/jzlib.changes b/jzlib.changes index 2a7a842..f451cf7 100644 --- a/jzlib.changes +++ b/jzlib.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 9 10:39:43 UTC 2017 - tchvatal@suse.com + +- Version update to 1.1.3: + * Various small fixes in from the github project +- Drop javadoc to bootstrap using gcj + ------------------------------------------------------------------- Tue Jul 8 09:27:35 UTC 2014 - tchvatal@suse.com diff --git a/jzlib.spec b/jzlib.spec index e92576f..1155716 100644 --- a/jzlib.spec +++ b/jzlib.spec @@ -1,7 +1,7 @@ # # spec file for package jzlib # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,20 +17,18 @@ Name: jzlib -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: Re-implementation of zlib in pure Java License: BSD-3-Clause Group: Development/Libraries/Java Url: http://www.jcraft.com/jzlib/ -# FIXME: getting HTTP 500 from github atm, downloaded from -# http://pkgs.fedoraproject.org/repo/pkgs/jzlib/1.1.2.tar.gz/f220e253a1edde7394d13d3042978805/1.1.2.tar.gz -#Source0: https://github.com/ymnk/jzlib/archive/1.1.2.tar.gz -Source0: 1.1.2.tar.gz +Source0: https://github.com/ymnk/jzlib/archive/%{version}.tar.gz Source1: %{name}_build.xml BuildRequires: ant >= 1.6 BuildRequires: java-devel BuildRequires: javapackages-tools +Obsoletes: %{name}-javadoc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -41,13 +39,6 @@ data-compression library for use on virtually any computer hardware and operating system. The zlib was written by Jean-loup Gailly (compression) and Mark Adler (decompression). -%package javadoc -Summary: Re-implementation of zlib in pure Java -Group: Development/Libraries/Java - -%description javadoc -Javadoc for %{summary}. - %package demo Summary: Re-implementation of zlib in pure Java Group: Development/Libraries/Java @@ -58,8 +49,6 @@ Demo files for %{summary}. %prep %setup -q cp %{SOURCE1} build.xml -#mkdir src -#mv com src # bnc#500524 # be sure that we don't distribute GPL derived code marked as BSD @@ -68,17 +57,13 @@ rm misc/mindtermsrc-v121-compression.patch %build ant \ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ - dist javadoc + dist %install # jar install -Dpm 644 dist/lib/%{name}.jar \ %{buildroot}%{_javadir}/%{name}.jar -# javadoc -install -dm 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name} - # examples install -dm 755 %{buildroot}%{_datadir}/%{name}-%{version} cp -pr example/* %{buildroot}%{_datadir}/%{name}-%{version} @@ -88,10 +73,6 @@ cp -pr example/* %{buildroot}%{_datadir}/%{name}-%{version} %{_javadir}/%{name}.jar %doc LICENSE.txt -%files javadoc -%defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name} - %files demo %defattr(0644,root,root,0755) %doc %{_datadir}/%{name}-%{version}