Hello community, here is the log from the commit of package sat4j for openSUSE:Factory checked in at 2018-12-04 20:56:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sat4j (Old) and /work/SRC/openSUSE:Factory/.sat4j.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sat4j" Tue Dec 4 20:56:05 2018 rev:19 rq:653652 version:2.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/sat4j/sat4j.changes 2017-09-20 17:13:54.499273207 +0200 +++ /work/SRC/openSUSE:Factory/.sat4j.new.19453/sat4j.changes 2018-12-04 20:56:25.224713293 +0100 @@ -1,0 +2,14 @@ +Fri Nov 23 15:25:48 UTC 2018 - Fridrich Strba <[email protected]> + +- Upgrade to version 2.3.5 +- Modified patch: + * sat4j-sourcetarget.patch + + rediff to changed context and add utf-8 encoding for build + +------------------------------------------------------------------- +Thu Nov 22 22:04:12 UTC 2018 - Fridrich Strba <[email protected]> + +- Buildrequire javapackages-local in order to generate the osgi + provides. + +------------------------------------------------------------------- Old: ---- sat4j-2.3.2.tar.bz2 New: ---- sat4j-2.3.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sat4j.spec ++++++ --- /var/tmp/diff_new_pack.4obQZf/_old 2018-12-04 20:56:25.900712548 +0100 +++ /var/tmp/diff_new_pack.4obQZf/_new 2018-12-04 20:56:25.900712548 +0100 @@ -1,7 +1,7 @@ # # spec file for package sat4j # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,25 +12,25 @@ # 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/ # %define eclipse_base %{_libdir}/eclipse # We want the version to match that shipped in Eclipse's Orbit project -%define qualifier 20120709 +%define qualifier 20181123 Name: sat4j -Version: 2.3.2 +Version: 2.3.5 Release: 0 Summary: A library of SAT solvers written in Java -License: EPL-1.0 AND LGPL-2.0 +License: EPL-1.0 AND LGPL-2.0-only Group: Development/Libraries/Java -Url: http://www.sat4j.org/ -# svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/org.sat4j.pom-2.3.2 -Source0: %{name}-%{version}.tar.bz2 +URL: http://www.sat4j.org/ +Source0: %{name}-%{version}.tar.xz Patch0: sat4j-sourcetarget.patch Patch1: sat4j-manifest.patch BuildRequires: ant +BuildRequires: javapackages-local Requires: java BuildArch: noarch @@ -41,11 +41,9 @@ without worrying about the details. %prep -%setup -q -n org.%{name}.pom-%{version} +%setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -# Only used for the tests -rm lib/commons-cli.jar %build ant \ ++++++ sat4j-sourcetarget.patch ++++++ --- /var/tmp/diff_new_pack.4obQZf/_old 2018-12-04 20:56:25.916712530 +0100 +++ /var/tmp/diff_new_pack.4obQZf/_new 2018-12-04 20:56:25.916712530 +0100 @@ -1,7 +1,11 @@ ---- org.sat4j.pom-2.3.2/build.xml 2017-09-20 09:05:47.517887173 +0200 -+++ org.sat4j.pom-2.3.2/build.xml 2017-09-20 09:13:23.469210761 +0200 -@@ -277,7 +277,8 @@ - <echo>Generating Javodoc</echo> +--- sat4j-2.3.5/build.xml 2013-05-29 08:15:51.000000000 +0200 ++++ sat4j-2.3.5/build.xml 2018-11-23 16:24:57.618120002 +0100 +@@ -295,10 +295,11 @@ + </path> + + <target name="javadoc"> +- <echo>Generating Javodoc</echo> ++ <echo>Generating Javadoc</echo> <javadoc destdir="${doc}/${module}" access="public" - source="1.6" @@ -10,7 +14,7 @@ use="true" notree="false" nonavbar="false" -@@ -303,8 +304,9 @@ +@@ -324,8 +325,9 @@ <javac srcdir="${src}" destdir="${build}" @@ -18,10 +22,10 @@ + source="${source}" target="${target}" + encoding="UTF-8" + debug="true" includeantruntime="false"> <classpath refid="somePath"/> - </javac> -@@ -408,7 +410,7 @@ +@@ -430,7 +432,7 @@ <target name="tests" description="Launch JUnit tests and generate a report"> <echo>Compiling test files</echo>
