From 7ca014cb7d55a029e6b82c9c83b8690ebdda6c34 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 13 May 2024 13:36:14 +0300 Subject: [PATCH] import sat4j-2.3.5-15.module_el8.1.0+280+b8d347df --- ...x-runtime-classpath-and-minimum-BREE.patch | 48 ------------------- SOURCES/sat4j-classpath.patch | 8 ++++ SPECS/sat4j.spec | 24 ++-------- 3 files changed, 13 insertions(+), 67 deletions(-) delete mode 100644 SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch create 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 deleted file mode 100644 index f3816d1..0000000 --- a/SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 new file mode 100644 index 0000000..219bd88 --- /dev/null +++ b/SOURCES/sat4j-classpath.patch @@ -0,0 +1,8 @@ +--- 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 aba81a2..f370a60 100644 --- a/SPECS/sat4j.spec +++ b/SPECS/sat4j.spec @@ -3,7 +3,7 @@ Name: sat4j Version: 2.3.5 -Release: 19%{?dist} +Release: 15%{?dist} Summary: A library of SAT solvers written in Java License: EPL-1.0 or LGPLv2 @@ -11,8 +11,7 @@ URL: http://www.sat4j.org/ # Created by sh sat4j-fetch.sh Source0: sat4j-%{version}.tar.xz Source1: sat4j-fetch.sh - -Patch0: 0001-Fix-runtime-classpath-and-minimum-BREE.patch +Patch0: sat4j-classpath.patch BuildRequires: ant BuildRequires: javapackages-local @@ -27,12 +26,11 @@ without worrying about the details. %prep %setup -q -n sat4j-%{version} -%patch0 -p1 +%patch0 %build -export ANT_OPTS="-Dfile.encoding=iso-8859-1" ant -Dbuild.compiler=modern -Drelease=%{version} \ - -Dtarget=1.8 -Dsource=1.8 -DBUILD_DATE=%{build_date} p2 + -Dtarget=1.5 -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 @@ -46,18 +44,6 @@ 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 @@ -182,4 +168,4 @@ ant -Dbuild.compiler=modern -Drelease=%{version} \ - Run tests * Thu Mar 13 2008 Andrew Overholt 2.0-0.1.RC5 -- Initial version \ No newline at end of file +- Initial version