From 9b5917a009ea95f64a693d92472efcbede87e14d Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Tue, 30 Jul 2013 17:10:30 +0200
Subject: [PATCH] Generate javadoc

- Drop group tag
---
 0001-Add-javadoc-target-to-build.xml.patch | 25 +++++++++
 javacc.spec                                | 63 ++++++++++++++--------
 2 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 0001-Add-javadoc-target-to-build.xml.patch

diff --git a/0001-Add-javadoc-target-to-build.xml.patch b/0001-Add-javadoc-target-to-build.xml.patch
new file mode 100644
index 0000000..2132410
--- /dev/null
+++ b/0001-Add-javadoc-target-to-build.xml.patch
@@ -0,0 +1,25 @@
+From 8f1dda63b3e44835a0a88975b368c132f538fd4f Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb@redhat.com>
+Date: Tue, 30 Jul 2013 15:10:14 +0200
+Subject: [PATCH] Add javadoc target to build.xml
+
+---
+ build.xml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index 7337939..0b283c5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -538,4 +538,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+   </target>
+ 
++  <target name="javadoc" depends="jar" description="generate javadoc">
++    <javadoc sourcepath="src/" destdir="api/" />
++  </target>
++
+ </project>
+-- 
+1.8.1.4
+
diff --git a/javacc.spec b/javacc.spec
index 50fb0f4..709e566 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -30,7 +30,7 @@
 
 Name:           javacc
 Version:        5.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -38,13 +38,14 @@ Source0:        http://java.net/projects/%{name}/downloads/download/%{name}-%{ve
 Source1:        javacc.sh
 Source2:        jjdoc
 Source3:        jjtree
-#Jar used for bootstrapping
-Source4:        javacc.jar
+Patch0:         0001-Add-javadoc-target-to-build.xml.patch
 URL:            http://javacc.java.net/
-Group:          Development/Tools
-Requires:       java, jpackage-utils >= 0:1.5
-BuildRequires:  ant, ant-junit, junit >= 0:3.8.1
-BuildRequires:  java-devel, jpackage-utils >= 0:1.5
+Requires:       java
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  junit
+BuildRequires:  javacc
+BuildRequires:  java-devel
 
 BuildArch:      noarch
 
@@ -58,30 +59,37 @@ a tool called JJTree included with JavaCC), actions, debugging, etc.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
 
 %description manual
 Manual for %{name}.
 
 %package demo
 Summary:        Examples for %{name}
-Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description demo
 Examples for %{name}.
 
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
 %prep
 %setup -q -n %{name}
 
+%patch0 -p1
+
 # Remove binary information in the source tar
-find . -name "*.jar" -exec rm {} \;
-find . -name "*.class" -exec rm {} \;
+find . -name "*.jar" -delete
+find . -name "*.class" -delete
 
 find ./examples -type f -exec sed -i 's/\r//' {} \;
 
-cp -p %{SOURCE4} bootstrap/javacc.jar
+ln -s `build-classpath javacc` bootstrap/javacc.jar
+
+sed -i 's/source="1.4"/source="1.5"/g' src/org/javacc/{parser,jjdoc,jjtree}/build.xml
 
 %build
 # Use the bootstrap javacc.jar to generate some required
@@ -89,23 +97,27 @@ cp -p %{SOURCE4} bootstrap/javacc.jar
 # remove the bootstrap jar and build the binary from source.
 ant -f src/org/javacc/parser/build.xml parser-files
 ant -f src/org/javacc/jjtree/build.xml tree-files
-find . -name "*.jar" -exec rm {} \;
-ant jar
+find . -name "*.jar" -delete
+ant jar javadoc
 
 %install
 # jar
-install -Dpm 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -Dpm 644 bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # bin
-install -Dp -T -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/javacc.sh
-install -Dp -T -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/jjdoc
-install -Dp -T -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/jjtree
+install -Dp -T -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/javacc.sh
+install -Dp -T -m 755 %{SOURCE2} %{buildroot}/%{_bindir}/jjdoc
+install -Dp -T -m 755 %{SOURCE3} %{buildroot}/%{_bindir}/jjtree
+
+# javadoc
+install -d -p 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -rp api/* %{buildroot}/%{_javadocdir}/%{name}
 
 # pom
-install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
+
 %files
 %{_javadir}/*.jar
 %doc LICENSE README
@@ -114,12 +126,21 @@ install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/*
 
 %files manual
+%doc LICENSE README
 %doc www/*
 
 %files demo
 %doc examples
 
+%files javadoc
+%doc LICENSE README
+%{_javadocdir}/%{name}
+
 %changelog
+* Tue Jul 30 2013 Michal Srb <msrb@redhat.com> - 0:5.0-9
+- Generate javadoc
+- Drop group tag
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild