rpms/sat4j/devel sat4j.spec,1.2,1.3

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/sat4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4608

Modified Files:
	sat4j.spec 
Log Message:
* Tue Jul 15 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-6
- Build with OpenJDK (java.util.Scanner)


Index: sat4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sat4j.spec	15 Jul 2008 16:31:22 -0000	1.2
+++ sat4j.spec	15 Jul 2008 16:59:38 -0000	1.3
@@ -1,10 +1,10 @@
-%define eclipse_base %{_datadir}/eclipse
+%define eclipse_base %{_libdir}/eclipse
 # We want the version to match that shipped in Eclipse's Orbit project
 %define sat4jversion 2.0.0.v20080602
 
 Name:           sat4j
 Version:        2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A library of SAT solvers written in Java
 
 Group:          Development/Libraries
@@ -23,10 +23,10 @@
 Patch2:         sat4j-junit4fortests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  java-devel >= 1.5
+BuildRequires:  java-devel >= 1:1.6
 BuildRequires:  junit4
 BuildRequires:  eclipse-pde
-Requires:       java >= 1.5
+Requires:       java >= 1:1.6
 Requires:       jpackage-utils
 
 BuildArch:      noarch
@@ -175,6 +175,9 @@
 %{_javadir}/org.sat4j*
 
 %changelog
+* Tue Jul 15 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-6
+- Build with OpenJDK (java.util.Scanner)
+
 * Tue Jul 15 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-5
 - Use sed instead of dos2unix