From cf1f7586f939f8a939885216c60d78552cdd3550 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 12 Nov 2020 04:25:13 -0500 Subject: [PATCH] import sat4j-2.3.5-19.module+el8.2.1+7436+4afdca1f --- ...x-runtime-classpath-and-minimum-BREE.patch | 48 +++++++++++++++++++ SOURCES/sat4j-classpath.patch | 8 ---- SPECS/sat4j.spec | 18 +++++-- 3 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch delete mode 100644 SOURCES/sat4j-classpath.patch diff --git a/SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch b/SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch new file mode 100644 index 0000000..f3816d1 --- /dev/null +++ b/SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch @@ -0,0 +1,48 @@ +From ad4a1884786434f200dc4a200b31b1d85aca11d3 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 18 Jun 2020 15:23:18 +0100 +Subject: [PATCH] Fix runtime classpath and minimum BREE + +--- + build.xml | 2 +- + org.sat4j.core/META-INF/MANIFEST.MF | 2 +- + org.sat4j.pb/META-INF/MANIFEST.MF | 3 +-- + 3 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/build.xml b/build.xml +index 624f511..122ad12 100644 +--- a/build.xml ++++ b/build.xml +@@ -324,7 +324,7 @@ + +diff --git a/org.sat4j.core/META-INF/MANIFEST.MF b/org.sat4j.core/META-INF/MANIFEST.MF +index e83a943..584326a 100644 +--- a/org.sat4j.core/META-INF/MANIFEST.MF ++++ b/org.sat4j.core/META-INF/MANIFEST.MF +@@ -29,4 +29,4 @@ Specification-Vendor: Daniel Le Berre + Implementation-Title: SAT4J + Implementation-Version: 9.9.9.token + Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +diff --git a/org.sat4j.pb/META-INF/MANIFEST.MF b/org.sat4j.pb/META-INF/MANIFEST.MF +index f5ef127..10fe459 100644 +--- a/org.sat4j.pb/META-INF/MANIFEST.MF ++++ b/org.sat4j.pb/META-INF/MANIFEST.MF +@@ -21,5 +21,4 @@ Specification-Vendor: Daniel Le Berre + Implementation-Title: SAT4J + Implementation-Version: 9.9.9.token + Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois +-Class-Path: org.sat4j.core.jar +-Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-- +2.26.2 + diff --git a/SOURCES/sat4j-classpath.patch b/SOURCES/sat4j-classpath.patch deleted file mode 100644 index 219bd88..0000000 --- a/SOURCES/sat4j-classpath.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- org.sat4j.pb/META-INF/MANIFEST.MF.sav 2010-03-26 15:20:38.390630122 +0200 -+++ org.sat4j.pb/META-INF/MANIFEST.MF 2010-03-26 15:20:50.549378523 +0200 -@@ -21,5 +21,4 @@ Specification-Vendor: Daniel Le Berre - Implementation-Title: SAT4J - Implementation-Version: 9.9.9.token - Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois --Class-Path: org.sat4j.core.jar - Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/SPECS/sat4j.spec b/SPECS/sat4j.spec index ec66525..aba81a2 100644 --- a/SPECS/sat4j.spec +++ b/SPECS/sat4j.spec @@ -3,7 +3,7 @@ Name: sat4j Version: 2.3.5 -Release: 17%{?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,12 @@ 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 @@ -174,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