[fop] - Update to 1.0. - BR/R java 1.6.0 not openjdk (rhbz#620330). - Remove jars in prep.

[Alexander Kurtakov]

commit 6d8c4d71cf0d1591095c41b0d0b7ea597ca2ed30
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Oct 1 08:03:26 2010 +0300

    - Update to 1.0.
    - BR/R java 1.6.0 not openjdk (rhbz#620330).
    - Remove jars in prep.

 .gitignore         |    1 +
 fop-manifest.patch |   22 ----------------------
 fop.spec           |   39 +++++++++++++++++++--------------------
 sources            |    1 +
 4 files changed, 21 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71ee9dc..a578c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fop-0.95-src.tar.gz
+fop-1.0-src.tar.gz
diff --git a/fop.spec b/fop.spec
index 770ed77..326cc50 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,34 +1,31 @@
 Summary:        XSL-driven print formatter
 Name:           fop
-Version:        0.95
-Release:        6%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 License:        ASL 2.0
 Group:          Applications/Text
 Source0:        http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.script
 Source2:        batik-pdf-MANIFEST.MF
-Patch0:         %{name}-manifest.patch
-Patch1:         %{name}-main.patch
+Patch0:         %{name}-main.patch
 URL:            http://xmlgraphics.apache.org/fop
 
 Requires:       xmlgraphics-commons >= 1.2
-Requires:       avalon-framework >= 4.1.4
 Requires:       batik >= 1.7
 Requires:       xalan-j2 >= 2.7.0
 Requires:       xml-commons-apis >= 1.3.04
 Requires:       jakarta-commons-httpclient
-Requires:       jakarta-commons-io >= 1.2
-Requires:       jakarta-commons-logging >= 1.0.4
-Requires:	java-1.6.0-openjdk
+Requires:       apache-commons-io >= 1.2
+Requires:       apache-commons-logging >= 1.0.4
+Requires:       java >= 1:1.6.0
 
 Requires(post): jpackage-utils
 Requires(postun): jpackage-utils
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
-BuildRequires:  ant-trax
-BuildRequires:  java-1.6.0-openjdk-devel
-BuildRequires:  java-1.6.0-openjdk-javadoc
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  java-javadoc >= 1:1.6.0
 BuildArch:      noarch
 
 %description
@@ -49,17 +46,14 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+%patch0 -p0
 
 %build
-export ANT_HOME=/usr/share/ant
-export JAVA_HOME=/usr/lib/jvm/java-openjdk
-export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax-1.7.0.jar
-export CLASSPATH=$CLASSPATH:/usr/share/java/xmlgraphics-commons.jar
-export CLASSPATH=$CLASSPATH:/usr/share/java/batik-all.jar
-export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis.jar
-export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis-ext.jar
+export CLASSPATH=$(build-classpath xmlgraphics-commons batik-all xml-commons-apis xml-commons-apis-ext)
 ant clean jar-main transcoder-pkg javadocs
 
 %install
@@ -122,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-1
+- Update to 1.0.
+- BR/R java 1.6.0 not openjdk (rhbz#620330).
+- Remove jars in prep.
+
 * Mon May 31 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.95-6
 - Fix specfile encoding.
 
diff --git a/sources b/sources
index 9da02a2..44ffcc2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 58593e6c86be17d7dc03c829630fd152  fop-0.95-src.tar.gz
+95dcc4c2dd08b4bc88ce9ce1ee88c439  fop-1.0-src.tar.gz