[rhino] Crosslink javadocs with Java's. Drop versioned jars and javadoc dir. Exclude patch backup files from

[Ville Skyttä]

commit 93ef8fcc4a5e65c2158e5a6b6d5f63923eaf1653
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Oct 16 14:37:55 2011 +0300

    Crosslink javadocs with Java's. Drop versioned jars and javadoc dir. Exclude patch backup files from -examples.

 rhino-1.7R3-crosslink.patch |   11 +++++++++++
 rhino.spec                  |   38 +++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 13 deletions(-)
---
diff --git a/rhino-1.7R3-crosslink.patch b/rhino-1.7R3-crosslink.patch
new file mode 100644
index 0000000..428632b
--- /dev/null
+++ b/rhino-1.7R3-crosslink.patch
@@ -0,0 +1,11 @@
+diff -up rhino1_7R3/build.xml~ rhino1_7R3/build.xml
+--- rhino1_7R3/build.xml~	2011-05-09 20:04:38.000000000 +0300
++++ rhino1_7R3/build.xml	2011-10-16 00:11:22.625045037 +0300
+@@ -220,6 +220,7 @@
+              destdir="${dist.dir}/javadoc"
+              version="true"
+              author="true"
++             link="/usr/share/javadoc/java"
+              windowtitle="${Name}" />
+   </target>
+ 
diff --git a/rhino.spec b/rhino.spec
index e21a22c..47ba710 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -35,7 +35,7 @@ Name:           rhino
 # of Javascript version 1.7 (which is independent from this particular implementation,
 # e.g., there is C++ implementation in Spidermonkey)
 Version:        1.7R3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        JavaScript for Java
 License:        MPLv1.1 or GPLv2+
 
@@ -48,6 +48,7 @@ Patch0:         %{name}-build.patch
 # Rip out of MANIFEST.MF included in this JAR:
 # http://www.eclipse.org/downloads/download.php?r=1&file=/tools/orbit/downloads/drops/R20110523182458/repository/plugins/org.mozilla.javascript_1.7.2.v201005080400.jar
 Patch1:         %{name}-addOrbitManifest.patch
+Patch2:         %{name}-1.7R3-crosslink.patch
 
 URL:            http://www.mozilla.org/rhino/
 Group:          Development/Libraries
@@ -86,6 +87,8 @@ Documentation for %{name}.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+BuildRequires:  java-javadoc
+Requires:       java-javadoc
 
 %description    javadoc
 Javadoc for %{name}.
@@ -94,6 +97,7 @@ Javadoc for %{name}.
 %setup -q -n %{name}%{cvs_version}
 %patch0 -p1 -b .build
 %patch1 -p1 -b .fixManifest
+%patch2 -p1 -b .crosslink
 
 # Fix build
 sed -i -e '/.*<get.*src=.*>$/d' build.xml testsrc/build.xml \
@@ -114,7 +118,7 @@ pushd examples
 
 export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
 %{javac} *.java
-%{jar} cvf ../build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar *.class
+%{jar} cvf ../build/%{name}%{cvs_version}/%{name}-examples.jar *.class
 popd
 
 %install
@@ -122,16 +126,13 @@ rm -rf %{buildroot}
 
 # jars
 mkdir -p %{buildroot}%{_javadir}
-cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-cp -a build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar
-(cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar js-%{version}.jar)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
+cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}
+ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar
+cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
 
 # javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-find %{buildroot}%{_javadocdir}/%{name}-%{version} -type f -name '*.html' | xargs sed -i -e 's/\r$//g'
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 ## script
 mkdir -p %{buildroot}%{_bindir}
@@ -140,10 +141,16 @@ install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
 # examples
 mkdir -p %{buildroot}%{_datadir}/%{name}
 cp -a examples/* %{buildroot}%{_datadir}/%{name}
+find %{buildroot}%{_datadir}/%{name} -name '*.build' -delete
 
 %clean
 %__rm -rf %{buildroot}
 
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+%__rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 %files
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/*
@@ -161,9 +168,14 @@ cp -a examples/* %{buildroot}%{_datadir}/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Oct 16 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.7R3-3
+- Crosslink javadocs with Java's.
+- Drop versioned jars and javadoc dir.
+- Exclude patch backup files from -examples.
+
 * Wed Sep 21 2011 Matěj Cepl <mcepl at redhat.com> - 1.7R3-2
 - Remove bea-stax-api dependency (and perl as well)
 
@@ -240,7 +252,7 @@ cp -a examples/* %{buildroot}%{_datadir}/%{name}
 - Update to 1.5R5.
 - Rebuild with Ant 1.6.2
 
-* Sat Jul 19 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5-1.R4.1.1jpp
+* Sat Jul 19 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5-1.R4.1.1jpp
 - Update to 1.5R4.1.
 - Non-versioned javadoc dir symlink.
 
@@ -248,7 +260,7 @@ cp -a examples/* %{buildroot}%{_datadir}/%{name}
 - remove build patches in favor of perl
 - add epoch
 
-* Sun Mar 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5-0.r4.1jpp
+* Sun Mar 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5-0.r4.1jpp
 - Update to 1.5R4.
 - Rebuild for JPackage 1.5.