rpms/xml-stylebook/devel xml-stylebook-build-javadoc.patch, 1.1, 1.2 xml-stylebook.spec, 1.2, 1.3

[mbooth]

Author: mbooth

Update of /cvs/pkgs/rpms/xml-stylebook/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14675/xml-stylebook/devel

Modified Files:
	xml-stylebook-build-javadoc.patch xml-stylebook.spec 
Log Message:
Link to local java API docs properly and fix requires on javadoc package.
Build with source and target levels of 1.5 so we don't have to require 1.6.


xml-stylebook-build-javadoc.patch:
 build.xml |   31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

Index: xml-stylebook-build-javadoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xml-stylebook/devel/xml-stylebook-build-javadoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xml-stylebook-build-javadoc.patch	14 Jan 2010 01:16:26 -0000	1.1
+++ xml-stylebook-build-javadoc.patch	12 Jun 2010 19:26:12 -0000	1.2
@@ -1,5 +1,5 @@
---- build.xml	2004-12-14 15:54:50.000000000 +0000
-+++ build.xml	2010-01-11 21:02:34.783136703 +0000
+--- build.xml.orig	2004-12-14 15:54:50.000000000 +0000
++++ build.xml	2010-06-12 19:50:39.976589551 +0100
 @@ -54,17 +54,16 @@
  	  <property name="build.dir" value="./build"/>
  	  <property name="build.src" value="${build.dir}/src"/>
@@ -20,9 +20,12 @@
      <copy todir="${build.src}">
        <fileset dir="${src.dir}"/>
      </copy>
-@@ -88,13 +87,12 @@
+@@ -86,15 +85,14 @@
+   
+ <!--Compile and Package to work with Xalan-J 2 -->
    <target name="compile2" depends="prepare">
-     <javac srcdir="${src.dir}" excludes="org/apache/stylebook/processors/XalanProcessor.java" destdir="${build.dest}" debug="${debug}">
+-    <javac srcdir="${src.dir}" excludes="org/apache/stylebook/processors/XalanProcessor.java" destdir="${build.dest}" debug="${debug}">
++    <javac srcdir="${src.dir}" excludes="org/apache/stylebook/processors/XalanProcessor.java" destdir="${build.dest}" debug="${debug}" target="1.5" source="1.5">
          <exclude name="**/org/apache/stylebook/processors/XalanProcessor.java"/>
 -        <exclude name="**/org/apache/stylebook/printers/ImagePrinter.java" unless="sun.codec.present"/>
      </javac>
@@ -56,7 +59,7 @@
 +      <classpath>
 +        <pathelement path="${bin.dir}"/>
 +      </classpath>
-+      <link offline="true" packagelistLoc="/usr/share/javadoc/java"/>
++      <link href="/usr/share/javadoc/java" offline="true" packagelistLoc="/usr/share/javadoc/java"/>
 +    </javadoc>
 +  </target>
 +


Index: xml-stylebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-stylebook/devel/xml-stylebook.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xml-stylebook.spec	22 Apr 2010 20:10:18 -0000	1.2
+++ xml-stylebook.spec	12 Jun 2010 19:26:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:          xml-stylebook
 Version:       1.0
-Release:       0.4.b3_xalan2.svn313293%{?dist}
+Release:       0.5.b3_xalan2.svn313293%{?dist}
 Summary:       Apache XML Stylebook
 Group:         Development/Libraries
 License:       ASL 1.1
@@ -21,23 +21,24 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildArch:     noarch
 
 BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-javadoc
 BuildRequires: jpackage-utils
 BuildRequires: ant
 BuildRequires: jaxp_parser_impl
 BuildRequires: dejavu-sans-fonts
-Requires:      java >= 1:1.6.0
+Requires:      java
 Requires:      jpackage-utils
 
 %description
 Apache XML Stylebook is a HTML documentation generator.
 
 %package       javadoc
-Summary:       Javadocs for %{name}
+Summary:       API documentation for %{name}
 Group:         Documentation
-Requires:      %{name} = %{version}-%{release}
+Requires:      java-javadoc
 
 %description   javadoc
-API documentation for %{name}.
+%{summary}.
 
 %package       demo
 Summary:       Examples for %{name}
@@ -118,6 +119,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name} 
 
 %changelog
+* Sat Jun 12 2010 Mat Booth <fedora at matbooth.co.uk> - 1.0-0.5.b3_xalan2.svn313293
+- Link to local java API docs properly and fix requires on javadoc package.
+- Build with source and target levels of 1.5 so we don't have to require 1.6.
+
 * Mon Apr 22 2010 Mat Booth <fedora at matbooth.co.uk> - 1.0-0.4.b3_xalan2.svn313293
 - Remove font from demo package to comply with guidelines. RHBZ #567912