diff --git a/.cvsignore b/.cvsignore
index b2586b6..62e6d70 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ xml-commons-resolver-1.1
noarch
*.src.rpm
xml-commons-resolver-1.1.tar.gz
+xml-commons-resolver-1.2.tar.gz
diff --git a/sources b/sources
index 893d8d5..1c2025d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e72bd3cbc4e5972d15f6a8f9842482e0 xml-commons-resolver-1.1-RHCLEAN.tar.bz2
-deb95bdf88687430445d34e8c11d475e xml-commons-resolver-1.1.tar.gz
+46d52acdb67ba60f0156043f30108766 xml-commons-resolver-1.2.tar.gz
diff --git a/xml-commons-resolver-src-version.patch b/xml-commons-resolver-src-version.patch
deleted file mode 100644
index f8b2c3c..0000000
--- a/xml-commons-resolver-src-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up ./resolver.xml.sav ./resolver.xml
---- ./resolver.xml.sav 2008-09-05 16:06:29.000000000 -0400
-+++ ./resolver.xml 2008-09-05 16:08:16.000000000 -0400
-@@ -83,7 +83,7 @@ Also, you may need to adjust src/documen
-
-
-
--
-+
-
-
-
-@@ -143,7 +143,8 @@ Also, you may need to adjust src/documen
- use="true"
- windowtitle="${name.resolver} API"
- doctitle="${name.resolver}"
-- bottom="${copyright.message}">
-+ bottom="${copyright.message}"
-+ source="1.4">
-
-
-
diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec
index 09e7644..35b66d3 100644
--- a/xml-commons-resolver.spec
+++ b/xml-commons-resolver.spec
@@ -1,20 +1,16 @@
-%define gcj_support 1
-
Name: xml-commons-resolver
-Version: 1.1
-Release: 4.17%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Epoch: 0
Summary: Resolver subproject of xml-commons
License: ASL 1.1
URL: http://xml.apache.org/commons/
-Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-1.1.tar.gz
+Source0: http://www.apache.org/dist/xml/commons/xml-commons-resolver-%{version}.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
-
Requires: jaxp_parser_impl
Requires: xml-commons-apis
BuildRequires: java-devel >= 1.6.0
@@ -24,17 +20,9 @@ BuildRequires: dos2unix
#BuildRequires: %{_bindir}/xsltproc
#BuildRequires: docbook-style-xsl
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
-%endif
-
%description
Resolver subproject of xml-commons.
@@ -51,8 +39,6 @@ Javadoc for %{name}.
%prep
%setup -q
-%patch0
-
# remove all binary libs and prebuilt javadocs
find . -name "*.jar" -exec rm -f {} \;
rm -rf docs
@@ -99,10 +85,6 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-resolver
cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread
cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -115,37 +97,21 @@ if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(0644,root,root,0755)
%doc KEYS LICENSE.resolver.txt
%{_javadir}/*
%attr(0755,root,root) %{_bindir}/*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%changelog
+* Fri Mar 5 2010 Alexander Kurtakov 0:1.2-1
+- Update to 1.2.
+- Drop gcj_support.
+
* Mon Jan 11 2010 Andrew Overholt 0:1.1-4.17
- Fix Group tags
- Remove '.' at end of Summary