[automaton] BR java-headless instead of java (bz 1067974). Link with offline Java javadocs. Minor spec file clea

[Jerry James]

commit 4d2fd382c80f85438cb4e25dd55104b7388813df
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri Feb 21 09:31:55 2014 -0700

    BR java-headless instead of java (bz 1067974).
    Link with offline Java javadocs.
    Minor spec file cleanups.

 automaton.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/automaton.spec b/automaton.spec
index 5b6feec..35fd118 100644
--- a/automaton.spec
+++ b/automaton.spec
@@ -5,18 +5,18 @@
 
 Name:           automaton
 Version:        %{upver}r%{uprel}
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Java finite state automata/regular expression library
 
-Group:          Development/Libraries/Java
 License:        BSD
 URL:            http://www.brics.dk/automaton/
 Source:         http://www.brics.dk/~amoeller/%{name}/%{name}-%{filever}.tar.gz
 
 BuildRequires:  ant
 BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  java-javadoc >= 1:1.6.0
 BuildRequires:  jpackage-utils
-Requires:       java
+Requires:       java-headless
 Requires:       jpackage-utils
 
 BuildArch:      noarch
@@ -33,26 +33,29 @@ symbolic representation based on intervals of Unicode characters.
 
 %package javadoc
 Summary:        A Java finite state automata/regular expression library
-Group:          Development/Documentation
 BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 Javadoc documentation for automaton.
 
 %prep
 %setup -q -n %{name}-%{upver}
-rm -f dist/%{name}.jar
+
+# Remove prebuilt artifacts
+rm -fr dist/%{name}.jar doc/*
+
+# Link to offline javadocs
+sed -i 's,http.*api/,file://%{_javadocdir}/java/,' build.xml
 
 %build
 ant all
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
+cp -p dist/%{name}.jar %{buildroot}%{_javadir}
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-mv doc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}
+cp -a doc %{buildroot}%{_javadocdir}/%{name}
 
 # Add Maven metadata
 %add_maven_depmap dk.brics.automaton:automaton:%{version} %{name}.jar
@@ -65,6 +68,11 @@ mv doc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Feb 21 2014 Jerry James <loganjerry at gmail.com> - 1.11r8-7
+- BR java-headless instead of java (bz 1067974)
+- Link with offline Java javadocs
+- Minor spec file cleanups
+
 * Mon Jan 13 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.11r8-6
 - Add Maven metadata
 - Resolves: rhbz#1052304