SOURCES/0001-Fix-runtime-classpath-and-minimum-BREE.patch

@@ -1,48 +0,0 @@
-From ad4a1884786434f200dc4a200b31b1d85aca11d3 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-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 @@
- 		<javac
- 		srcdir="${src}"
- 		destdir="${build}"
--		source="1.5"
-+		source="${source}"
- 		target="${target}"
- 		debug="true"
- 	        includeantruntime="false">
-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
-

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

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:         sat4j-classpath.patch
-Patch0:         0001-Fix-runtime-classpath-and-minimum-BREE.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 <jvanek@redhat.com> - 2.3.5-19
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 2.3.5-18
-- Allow building on Java 11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.5-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.5-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Tue Jun 11 2019 Mat Booth <mat.booth@redhat.com> - 2.3.5-15
 - Fix license tag