From 2261949b94deffeefd4e35d3e4569559d0a05b51 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 13:21:47 -0500 Subject: [PATCH] Import rpm: 95e1cea02add331e4c4d7a937bddf7fc317fb0bc --- sat4j.spec | 24 +++++++++++++++++++----- sources | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sat4j.spec b/sat4j.spec index f370a60..aba81a2 100644 --- a/sat4j.spec +++ b/sat4j.spec @@ -3,7 +3,7 @@ Name: sat4j Version: 2.3.5 -Release: 15%{?dist} +Release: 19%{?dist} Summary: A library of SAT solvers written in Java License: EPL-1.0 or LGPLv2 @@ -11,7 +11,8 @@ URL: http://www.sat4j.org/ # Created by sh sat4j-fetch.sh Source0: sat4j-%{version}.tar.xz Source1: sat4j-fetch.sh -Patch0: sat4j-classpath.patch + +Patch0: 0001-Fix-runtime-classpath-and-minimum-BREE.patch BuildRequires: ant BuildRequires: javapackages-local @@ -26,11 +27,12 @@ without worrying about the details. %prep %setup -q -n sat4j-%{version} -%patch0 +%patch0 -p1 %build +export ANT_OPTS="-Dfile.encoding=iso-8859-1" ant -Dbuild.compiler=modern -Drelease=%{version} \ - -Dtarget=1.5 -DBUILD_DATE=%{build_date} p2 + -Dtarget=1.8 -Dsource=1.8 -DBUILD_DATE=%{build_date} p2 %mvn_artifact "org.ow2.sat4j:org.ow2.sat4j.core::%{version}" dist/%{version}/org.sat4j.core.jar %mvn_artifact "org.ow2.sat4j:org.ow2.sat4j.pb::%{version}" dist/%{version}/org.sat4j.pb.jar @@ -44,6 +46,18 @@ ant -Dbuild.compiler=modern -Drelease=%{version} \ # No %%doc files as the about.html is in the jar %changelog +* Sat Jul 11 2020 Jiri Vanek - 2.3.5-19 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 18 2020 Mat Booth - 2.3.5-18 +- Allow building on Java 11 + +* Thu Jan 30 2020 Fedora Release Engineering - 2.3.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 2.3.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 11 2019 Mat Booth - 2.3.5-15 - Fix license tag @@ -168,4 +182,4 @@ ant -Dbuild.compiler=modern -Drelease=%{version} \ - Run tests * Thu Mar 13 2008 Andrew Overholt 2.0-0.1.RC5 -- Initial version +- Initial version \ No newline at end of file diff --git a/sources b/sources index db598ec..ddd31cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sat4j-2.3.5.tar.xz) = 5558c058ff21bf30e87fcf1c4ed2daa43f48871d9c8e1e9f2d191233848c4345d1df9b9d1d3386592de2439d5dd76a81678a1c298b7f992b4d21a08cfe92e83c +SHA1 (sat4j-2.3.5.tar.xz) = ab9d5a51c096e395c1db9daa887c5736cdbdff2f