[sat4j] Remove useless parts and require java-headless.

[Alexander Kurtakov]

commit fa00392df49d43e8ab7db317df273327d3cc780f
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Feb 21 19:23:47 2014 +0200

    Remove useless parts and require java-headless.

 sat4j.spec |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/sat4j.spec b/sat4j.spec
index 063a0ae..44cbcec 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -8,23 +8,22 @@
 
 Name:           %{?scl_prefix}sat4j
 Version:        2.3.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library of SAT solvers written in Java
 
 Group:          Development/Libraries
 License:        EPL or LGPLv2
 URL:            http://www.sat4j.org/
-# Created by sh %{pkg_name}-fetch.sh
+# Created by sh %%{pkg_name}-fetch.sh
 Source0:        %{pkg_name}-%{version}.tar.xz
 Source1:        %{pkg_name}-fetch.sh
 Patch0:         %{pkg_name}-classpath.patch
-BuildRoot:      %{_tmppath}/%{pkg_name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1:1.6
 BuildRequires:  ant
 BuildRequires:  ecj
-Requires:       java >= 1:1.6
-Requires:       jpackage-utils
+Requires:       java-headless >= 1:1.6
+Requires:       javapackages-tools
 %{?scl:Requires: %scl_runtime}
 
 BuildArch:      noarch
@@ -40,9 +39,9 @@ without worrying about the details.
 %patch0
 
 pushd lib
-	ln -s /usr/share/java/commons-beanutils.jar
-	ln -s /usr/share/java/commons-logging.jar
-	ln -s /usr/share/java/mockito.jar mockito-all-1.9.5.jar
+    ln -s /usr/share/java/commons-beanutils.jar
+    ln -s /usr/share/java/commons-logging.jar
+    ln -s /usr/share/java/mockito.jar mockito-all-1.9.5.jar
 popd
 
 %build
@@ -51,22 +50,21 @@ ant -Dbuild.compiler=modern -Drelease=%{version} \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 cp -rp dist/%{version}/org.sat4j.core.jar \
  $RPM_BUILD_ROOT%{_javadir}
 cp -rp dist/%{version}/org.sat4j.pb.jar \
  $RPM_BUILD_ROOT%{_javadir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 # No %%doc files as the about.html is in the jar
 %{_javadir}/org.sat4j*
 
 %changelog
+* Fri Feb 21 2014 Alexander Kurtakov <akurtako at redhat.com> 2.3.5-3
+- Remove useless parts.
+- Require java-headless.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild