diff --git a/batik-pdf-MANIFEST.MF b/batik-pdf-MANIFEST.MF
deleted file mode 100644
index 15c910d..0000000
--- a/batik-pdf-MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.apache.fop.cli.Main
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-SymbolicName: org.apache.batik.pdf
-Import-Package: org.apache.batik.bridge;version="[1.6.0,1.7.0)",org.ap
- ache.batik.dom.svg;version="[1.6.0,1.7.0)",org.apache.batik.dom.util;
- version="[1.6.0,1.7.0)",org.apache.batik.ext.awt;version="[1.6.0,1.7.
- 0)",org.apache.batik.ext.awt.g2d;version="[1.6.0,1.7.0)",org.apache.b
- atik.gvt;version="[1.6.0,1.7.0)",org.apache.batik.gvt.renderer;versio
- n="[1.6.0,1.7.0)",org.apache.batik.gvt.text;version="[1.6.0,1.7.0)",o
- rg.apache.batik.transcoder;version="[1.6.0,1.7.0)",org.apache.batik.t
- ranscoder.image;version="[1.6.0,1.7.0)",org.apache.batik.transcoder.k
- eys;version="[1.6.0,1.7.0)",org.apache.batik.util;version="[1.6.0,1.7
- .0)",org.w3c.dom
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-Localization: plugin
-Bundle-Version: 1.6.0.v200806031500
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.apache.avalon.framework,org.apache.avalon.framewor
- k.activity,org.apache.avalon.framework.configuration,org.apache.avalo
- n.framework.container,org.apache.commons.io,org.apache.commons.io.out
- put,org.apache.commons.logging,org.apache.commons.logging.impl,org.ap
- ache.fop.apps,org.apache.fop.fo,org.apache.fop.fonts,org.apache.fop.f
- onts.apps,org.apache.fop.fonts.base14,org.apache.fop.fonts.truetype,o
- rg.apache.fop.fonts.type1,org.apache.fop.image,org.apache.fop.image.a
- nalyser,org.apache.fop.pdf,org.apache.fop.render.pdf,org.apache.fop.r
- ender.ps,org.apache.fop.svg,org.apache.fop.util
diff --git a/fop-1.0.pom b/fop-1.0.pom
deleted file mode 100644
index 46b43c4..0000000
--- a/fop-1.0.pom
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
- 4.0.0
- org.apache.xmlgraphics
- fop
- jar
- Apache FOP
- 1.0
- http://xmlgraphics.apache.org/fop/
- Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.
- 1999
-
-
- FOP Users List
- fop-users-subscribe@xmlgraphics.apache.org
- fop-users-unsubscribe@xmlgraphics.apache.org
- http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/
-
-
- FOP Developer List
- fop-dev-subscribe@xmlgraphics.apache.org
- fop-dev-unsubscribe@xmlgraphics.apache.org
- http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/
-
-
- FOP Commit List
- fop-commits-subscribe@xmlgraphics.apache.org
- fop-commits-unsubscribe@xmlgraphics.apache.org
- http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/
-
-
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
- scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
- scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
- http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN
-
-
- Apache Software Foundation
- http://www.apache.org/
-
-
-
-
- org.apache.xmlgraphics
- xmlgraphics-commons
- 1.4
-
-
- org.apache.xmlgraphics
- batik-svg-dom
- 1.7
-
-
- org.apache.xmlgraphics
- batik-bridge
- 1.7
-
-
- org.apache.xmlgraphics
- batik-awt-util
- 1.7
-
-
- org.apache.xmlgraphics
- batik-gvt
- 1.7
-
-
- org.apache.xmlgraphics
- batik-transcoder
- 1.7
-
-
- org.apache.xmlgraphics
- fop
-
-
-
-
- org.apache.xmlgraphics
- batik-extension
- 1.7
-
-
- org.apache.xmlgraphics
- batik-ext
- 1.7
-
-
-
- commons-logging
- commons-logging
- 1.0.4
-
-
- commons-io
- commons-io
- 1.3.1
-
-
- org.apache.avalon.framework
- avalon-framework-api
- 4.3.1
-
-
- org.apache.avalon.framework
- avalon-framework-impl
- 4.3.1
-
-
- javax.servlet
- servlet-api
- 2.2
- provided
-
-
- xalan
- xalan
- 2.7.0
- provided
-
-
-
diff --git a/fop.script b/fop.script
index 65282de..2da49be 100644
--- a/fop.script
+++ b/fop.script
@@ -30,8 +30,5 @@ set_classpath commons-io batik-all avalon-framework xmlgraphics-commons \
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
-
-export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis-ext.jar
-
# Let's start
run "$@"
diff --git a/fop.spec b/fop.spec
index 4fb7e9a..a98affc 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,41 +1,29 @@
-Summary: XSL-driven print formatter
-Name: fop
-Version: 1.0
-Release: 9%{?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
-Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom
-Patch0: %{name}-main.patch
-URL: http://xmlgraphics.apache.org/fop
-
-Requires: xmlgraphics-commons >= 1.2
-Requires: batik >= 1.7
-Requires: xalan-j2 >= 2.7.0
-Requires: xml-commons-apis >= 1.3.04
-Requires: jakarta-commons-httpclient
-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
-
-BuildRequires: ant
-BuildRequires: ant-nodeps
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: java-javadoc >= 1:1.6.0
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-io
-BuildRequires: batik
-BuildRequires: xmlgraphics-commons >= 1.4
-BuildRequires: avalon-framework
-BuildRequires: servlet
-BuildRequires: qdox
-
-BuildArch: noarch
+%define gcj_support 0
+
+Summary: XSL-driven print formatter
+Name: fop
+Version: 1.0
+Release: 11%{?dist}
+License: ASL 2.0
+Group: Applications/Text
+URL: http://xmlgraphics.apache.org/fop
+Source0: http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz
+Source1: %{name}.script
+Patch1: %{name}-main.patch
+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
+BuildRequires: ant
+BuildRequires: ant-trax
+BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: java-1.6.0-openjdk-javadoc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
FOP is the world's first print formatter driven by XSL formatting
@@ -45,158 +33,123 @@ be in the form of an XML document (output by an XSLT engine like XT or
Xalan) or can be passed in memory as a DOM Document or (in the case of
XT) SAX events.
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
-Requires: jpackage-utils
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Development/Java
%description javadoc
Javadoc for %{name}.
-
%prep
%setup -q
-
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
-
-%patch0 -p0
+%patch1 -p0
%build
-export CLASSPATH=$(build-classpath ant-nodeps xmlgraphics-commons avalon-framework batik-all xml-commons-apis xml-commons-apis-ext commons-logging commons-io servlet qdox)
-ant clean jar-main transcoder-pkg javadocs
+export JAVA_HOME=%{java_home}
+export CLASSPATH=
+export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/trax`"
+
+%ant clean jar-main transcoder-pkg javadocs
%install
-# inject OSGi manifests
-mkdir -p META-INF
-cp -p %{SOURCE2} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u build/%{name}.jar META-INF/MANIFEST.MF
+rm -rf %{buildroot}
# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-cp -p build/%{name}-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/pdf-transcoder.jar
+mkdir -p %{buildroot}%{_javadir}
+cp -a build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+cp -a build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar
+pushd %{buildroot}%{_javadir}
+for jar in *-%{version}*
+do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`
+done
+popd
# script
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fop
+mkdir -p %{buildroot}%{_bindir}
+cp -a %{SOURCE1} %{buildroot}%{_bindir}/fop
# data
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr conf $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -a conf %{buildroot}%{_datadir}/%{name}
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -a build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name} %{version}
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
-%pre javadoc
-# workaround for rpm bug 646523, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+%clean
+rm -rf %{buildroot}
+%if %{gcj_support}
%post
-%update_maven_depmap
+%{update_gcjdb}
%postun
-%update_maven_depmap
-
+%{clean_gcjdb}
+%endif
%files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%doc LICENSE README NOTICE
-%{_javadir}/%{name}.jar
-%{_javadir}/pdf-transcoder.jar
+%{_javadir}/%{name}*.jar
%{_datadir}/%{name}
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*pom
+%{_javadir}/pdf-transcoder.jar
%attr(0755,root,root) %{_bindir}/fop
-
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%{_libdir}/gcj/%{name}/*
+%endif
%files javadoc
-%defattr(-,root,root,-)
-%doc LICENSE
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
-* Tue Feb 08 2011 Fedora Release Engineering - 1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 4 2011 Rüdiger Landmann - 1.0-8
-- BR qdox
-
-* Tue Jan 4 2011 Rüdiger Landmann - 1.0-7
-- set BR on xmlgraphics-commons >= 1.4
-- Add qdox classpath
-
-* Fri Dec 3 2010 Stanislav Ochotnicky - 1.0-6
-- Add LICENSE to javadoc sub-package
-- Few other tweaks according to new guidelines
-- Make jars and javadoc versionless
-- Add pom file (Resolves rhbz#655804)
-
-* Fri Oct 1 2010 Alexander Kurtakov 1.0-5
-- We need servlet not jsp.
-
-* Fri Oct 1 2010 Alexander Kurtakov 1.0-4
-- BR jsp.
-
-* Fri Oct 1 2010 Alexander Kurtakov 1.0-3
-- Add more BRs.
+* Thu Mar 10 2011 Rüdiger Landmann 1.0-11
+- import 1.0 into Fedora, based on Mandriva package
+- drop obsolete manifest patch
+
+* Thu Dec 09 2010 Paulo Ricardo Zanoni 1.0-0.0.3mdv2011.0
+- Revision: 617684
+- Resubmit after moving
+
+* Sat Sep 04 2010 Tomasz Pawel Gajc 1.0-0.0.2mdv2011.0
+- Revision: 576002
+- rebuild for new xmlgraphics-commons
+
+* Sun Aug 29 2010 Tomasz Pawel Gajc 1.0-0.0.1mdv2011.0
+- Revision: 574030
+- update to new version 1.0
+- disable patch 1
+- disable gcj support
+
+* Thu Apr 29 2010 Tomasz Pawel Gajc 0.95-0.0.3mdv2010.1
+- Revision: 540954
+- rebuild
+
+* Fri Sep 11 2009 Thierry Vignaud 0.95-0.0.2mdv2010.0
+- Revision: 437573
+- rebuild
+
+* Wed Dec 17 2008 Tomasz Pawel Gajc 0.95-0.0.1mdv2009.1
+- Revision: 315376
+- update to new version 0.95
+- drop patch0, not needed anymore
+- spec file clean
+- drop useles buildrequires
+- use %%java_home
+
+* Sat Dec 29 2007 David Walluck 0.94-0.2.1mdv2008.1
+- Revision: 139372
+- spec cleanup
+- import fop
-* Fri Oct 1 2010 Alexander Kurtakov 1.0-2
-- BR ant-nodeps.
-
-* Fri Oct 1 2010 Alexander Kurtakov 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ä - 0.95-6
-- Fix specfile encoding.
-
-* Thu Mar 25 2010 Mary Ellen Foster - 0.95-5
-- Add maven depmap fragment
-- Add dist to version
-
-* Fri Jul 24 2009 Fedora Release Engineering - 0.95-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering - 0.95-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 6 2009 Alexander Kurtakov 0.95-2
-- Add OSGi manifest (needed for eclipse-birt).
-
-* Thu Dec 18 2008 Lubomir Rintel - 0.95-1
-- New upstream release
-
-* Wed Apr 2 2008 Lillian Angel - 0.95.0.2.beta1
-- Updated release.
-
-* Tue Apr 1 2008 Lillian Angel - 0.95.0.1.beta1
-- Added CLASSPATH to fop.script.
-
-* Mon Mar 31 2008 Lillian Angel - 0.95.0.1.beta1
-- Updated sources to 0.95 beta.
-- Updated patches.
-- Updated release.
-
-* Mon Mar 31 2008 Lillian Angel - 0.94.4
-- Updated CLASSPATH.
-- Updated release.
-
-* Mon Mar 31 2008 Lillian Angel - 0.94.3
-- Fixed JAVA_HOME to point to openjdk, instead of icedtea.
-
-* Mon Mar 31 2008 Lillian Angel - 0.94.3
-- Updated build requirements and requirements to include java-1.6.0-openjdk.
-- Updated release.
* Fri Dec 7 2007 Lillian Angel - 0.94-2
- Updated Release.
@@ -234,7 +187,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
* Tue Jun 01 2004 Randy Watler - 0:0.20.5-4jpp
- Upgrade to Ant 1.6.X
-* Thu Jan 8 2004 Ville Skyttä - 0:0.20.5-3jpp
+* Thu Jan 8 2004 Ville Skyttä - 0:0.20.5-3jpp
- BuildRequires ant-optional.
- Crosslink with full J2SE javadocs instead of just JAXP/XML-commons.
- Add Main-Class back to manifest.
@@ -244,17 +197,17 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
- Remove class path in manifest
- New javadoc style
-* Sat Jul 19 2003 Ville Skyttä - 0:0.20.5-1jpp
+* Sat Jul 19 2003 Ville Skyttä - 0:0.20.5-1jpp
- Update to 0.20.5.
- Crosslink with xml-commons-apis and batik javadocs.
- BuildRequires jai, jce and jimi.
-* Sat Jun 7 2003 Ville Skyttä - 0:0.20.5-0.rc3a.1jpp
+* Sat Jun 7 2003 Ville Skyttä - 0:0.20.5-0.rc3a.1jpp
- Update to 0.20.5rc3a.
- Include fop script.
- Non-versioned javadoc symlinks.
-* Thu Apr 17 2003 Ville Skyttä - 0:0.20.5-0.rc2.1jpp
+* Thu Apr 17 2003 Ville Skyttä - 0:0.20.5-0.rc2.1jpp
- Update to 0.20.5rc2 and JPackage 1.5.
* Sun Mar 10 2002 Guillaume Rousse 0.20.3-1jpp
@@ -272,3 +225,4 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
* Thu Aug 30 2001 Guillaume Rousse 0.20.1-1mdk
- first release
+
diff --git a/sources b/sources
index 44ffcc2..49c53ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-58593e6c86be17d7dc03c829630fd152 fop-0.95-src.tar.gz
95dcc4c2dd08b4bc88ce9ce1ee88c439 fop-1.0-src.tar.gz