- Add a build dep on a font package because the JDK is missing a dependency

to function correctly in headless mode. See RHBZ #478480 and #521523.
- Fix groups.

xerces-j2.spec

@@ -2,9 +2,9 @@
 
 Name:          xerces-j2
 Version:       2.9.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Java XML parser
-Group:         Development/Libraries/Java
+Group:         Development/Libraries
 License:       ASL 2.0
 URL:           http://xerces.apache.org/xerces2-j/
 
@@ -25,7 +25,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
 BuildRequires: xml-commons-apis >= 1.3
 BuildRequires: xml-commons-resolver >= 1.1
@@ -33,7 +33,8 @@ BuildRequires: ant
 BuildRequires: xalan-j2
 BuildRequires: xml-stylebook
 BuildRequires: jaxp_parser_impl
-Requires:      java
+BuildRequires: dejavu-sans-fonts
+Requires:      java >= 1:1.6.0
 Requires:      jpackage-utils
 Requires:      xml-commons-apis >= 1.3
 Requires:      xml-commons-resolver >= 1.1
@@ -71,7 +72,7 @@ APIs are in use.
 
 %package        javadoc-impl
 Summary:        Javadoc for %{name} implementation
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description    javadoc-impl
@@ -79,23 +80,23 @@ Javadoc for %{name} implementation.
 
 %package        javadoc-apis
 Summary:        Javadoc for %{name} apis
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description    javadoc-apis
 Javadoc for %{name} apis.
 
 %package        javadoc-xni
-Summary:        Javadoc for %{name} xni
+Summary:        Javadoc for %{name} XNI
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description    javadoc-xni
-Javadoc for %{name} xni.
+Javadoc for %{name} XNI.
 
 %package        javadoc-other
 Summary:        Javadoc for other %{name} components
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description    javadoc-other
@@ -103,7 +104,7 @@ Javadoc for other %{name} components.
 
 %package        manual
 Summary:        Manual for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description    manual
@@ -111,7 +112,7 @@ Manual for %{name}.
 
 %package        demo
 Summary:        Demo for %{name}
-Group:          Development/Testing
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    demo
@@ -119,7 +120,7 @@ Demonstrations and samples for %{name}.
 
 %package        scripts
 Summary:        Additional utility scripts for %{name}
-Group:          Text Processing/Markup/XML
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    scripts
@@ -276,6 +277,11 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 %{_bindir}/*
 
 %changelog
+* Thu Jan 14 2010 Mat Booth <fedora@matbooth.co.uk> - 2.9.0-2
+- Add a build dep on a font package because the JDK is missing a dependency
+  to function correctly in headless mode. See RHBZ #478480 and #521523.
+- Fix groups.
+
 * Tue Jan 5 2010 Mat Booth <fedora@matbooth.co.uk> - 2.9.0-1
 - Update to 2.9.0: This is the version Eclipse expects, previously the OSGi
   manifest was lying about its version :-o