From d374ae37f65c1025186f1eddbb1279723e454b38 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Mon, 11 Jan 2010 15:24:31 +0000
Subject: [PATCH] - Fix Group tags - Remove '.' at end of Summary - Add
 dos2unix BR and fix line endings - Use upstream tarball

---
 .cvsignore                |  1 +
 sources                   |  1 +
 xml-commons-resolver.spec | 35 +++++++++++++++++++----------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 20b210c..b2586b6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ xml-commons-resolver-1.1-RHCLEAN.tar.bz2
 xml-commons-resolver-1.1
 noarch
 *.src.rpm
+xml-commons-resolver-1.1.tar.gz
diff --git a/sources b/sources
index f639b6a..893d8d5 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 e72bd3cbc4e5972d15f6a8f9842482e0  xml-commons-resolver-1.1-RHCLEAN.tar.bz2
+deb95bdf88687430445d34e8c11d475e  xml-commons-resolver-1.1.tar.gz
diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec
index ce88597..09e7644 100644
--- a/xml-commons-resolver.spec
+++ b/xml-commons-resolver.spec
@@ -1,42 +1,38 @@
-
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define section		free
+%define gcj_support 1
 
 Name:           xml-commons-resolver
 Version:        1.1
-Release:        4.16%{?dist}
+Release:        4.17%{?dist}
 Epoch:          0
-Summary:        Resolver subproject of xml-commons.
+Summary:        Resolver subproject of xml-commons
 License:        ASL 1.1
 URL:            http://xml.apache.org/commons/
-Source0:        xml-commons-resolver-1.1-RHCLEAN.tar.bz2
+Source0:        http://www.apache.org/dist/xml/commons/xml-commons-resolver-1.1.tar.gz
 Source1:        xml-commons-resolver-resolver.sh
 Source2:        xml-commons-resolver-xread.sh
 Source3:        xml-commons-resolver-xparse.sh
 Source4:        %{name}-MANIFEST.MF
 
-Patch0:			%{name}-src-version.patch
+Patch0:         %{name}-src-version.patch
 
 Requires:       jaxp_parser_impl
-Requires:	xml-commons-apis
+Requires:       xml-commons-apis
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  dos2unix
 #BuildRequires:  %{_bindir}/xsltproc
 #BuildRequires:  docbook-style-xsl
-Group:          Text Processing/Markup/XML
+Group:          Development/Libraries
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:  java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
 %endif
 
 %description
@@ -44,7 +40,7 @@ Resolver subproject of xml-commons.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 # for /bin/rm and /bin/ln
 Requires(post):   coreutils
 Requires(postun): coreutils
@@ -60,6 +56,7 @@ Javadoc for %{name}.
 # remove all binary libs and prebuilt javadocs
 find . -name "*.jar" -exec rm -f {} \;
 rm -rf docs
+dos2unix KEYS LICENSE.resolver.txt
 
 %build
 perl -p -i -e 's|call Resolver|call resolver|g' resolver.xml
@@ -149,6 +146,12 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Jan 11 2010 Andrew Overholt <overholt@redhat.com> 0:1.1-4.17
+- Fix Group tags
+- Remove '.' at end of Summary
+- Add dos2unix BR and fix line endings
+- Use upstream tarball
+
 * Sat Aug  8 2009 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1-4.16
 - Fix specfile UTF-8 encoding.