diff --git a/.gitignore b/.gitignore index a578c97..c7cf340 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ fop-0.95-src.tar.gz fop-1.0-src.tar.gz +/event-model.tgz diff --git a/fop-manifest.patch b/fop-manifest.patch new file mode 100644 index 0000000..d1e23a9 --- /dev/null +++ b/fop-manifest.patch @@ -0,0 +1,25 @@ +diff -uN fop-1.0/build.xml fop-1.0-mod/build.xml +--- fop-1.0/build.xml 2010-07-13 05:34:37.000000000 +1000 ++++ fop-1.0-mod/build.xml 2011-03-10 14:42:17.000000000 +1000 +@@ -517,10 +517,10 @@ + + + +- ++ + +- +- + +
+ + +--- fop-1.0/fop.mf 2011-03-10 14:53:21.000000000 +1000 ++++ fop-1.0-mod/fop.mf 2011-03-10 14:53:21.000000000 +1000 +@@ -0,0 +1,3 @@ ++Manifest-Version: 1.0 ++Main-Class: org.apache.fop.cli.Main ++ + diff --git a/fop.script b/fop.script index 65282de..8e688e4 100644 --- a/fop.script +++ b/fop.script @@ -25,13 +25,11 @@ fi MAIN_CLASS=org.apache.fop.cli.Main # Set parameters set_jvm -set_classpath commons-io batik-all avalon-framework xmlgraphics-commons \ +set_classpath commons-io batik-all avalon-framework-api \ + avalon-framework-impl xmlgraphics-commons \ commons-logging fop 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..ec9987a 100644 --- a/fop.spec +++ b/fop.spec @@ -1,41 +1,45 @@ -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 +Summary: XSL-driven print formatter +Name: fop +Version: 1.0 +Release: 17%{?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 +Source2: batik-pdf-MANIFEST.MF +Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom +Patch0: %{name}-manifest.patch +Patch1: %{name}-main.patch +BuildArch: noarch +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: apache-commons-io >= 1.2 +Requires: apache-commons-logging >= 1.0.4 +Requires: java >= 1:1.6.0 +Requires: jpackage-utils 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 +BuildRequires: ant +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-javadoc >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-io +BuildRequires: avalon-framework +BuildRequires: xmlgraphics-commons +BuildRequires: batik +BuildRequires: servlet +BuildRequires: qdox +BuildRequires: xmlunit +BuildRequires: zip +BuildRequires: junit %description FOP is the world's first print formatter driven by XSL formatting @@ -45,26 +49,31 @@ 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: Documentation +Requires: jpackage-utils %description javadoc Javadoc for %{name}. - %prep %setup -q +%patch0 -p1 +%patch1 -p0 find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; -%patch0 -p0 +sed -i -e "s|1.4|1.5|g" build.xml + +#upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 +ln -s %{_javadir}/qdox.jar lib/build/qdox.jar %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 +#qdox intentionally left off classpath -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 +export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io xmlgraphics-commons batik-all avalon-framework-api avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis xml-commons-apis-ext objectweb-asm/asm-all xmlunit) +ant jar-main transcoder-pkg javadocs %install # inject OSGi manifests @@ -74,21 +83,21 @@ touch META-INF/MANIFEST.MF zip -u build/%{name}.jar META-INF/MANIFEST.MF # 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}.jar +cp -a build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar # 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} +cp -a build/javadocs/* %{buildroot}%{_javadocdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom @@ -110,20 +119,44 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %defattr(-,root,root,-) %doc LICENSE README NOTICE %{_javadir}/%{name}.jar -%{_javadir}/pdf-transcoder.jar %{_datadir}/%{name} +%{_javadir}/pdf-transcoder.jar %{_mavendepmapfragdir}/* %{_mavenpomdir}/*pom %attr(0755,root,root) %{_bindir}/fop - %files javadoc %defattr(-,root,root,-) -%doc LICENSE %doc %{_javadocdir}/%{name} +%doc LICENSE %changelog +* Tue Jun 21 2011 Rüdiger Landmann 1.0-16 +- Supply missing event-model.xml files + +* Fri Jun 3 2011 Rüdiger Landmann 1.0-15 +- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath + +* Thu Mar 10 2011 Alexander Kurtakov 1.0-14 +- Reapply Fedora guidelines. +- Re-add pom.xml to unbreak Maven stack. +- Re-add OSGi manifest to unbreak Eclipse stack. +- Remove all bundled jars and classes and fix the build to work with our libs. + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-13 +- reinstate updated manifest patch +- change define to global + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-12 +- buildarch: noarch + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-11 +- drop obsolete manifest patch + +* Wed Mar 10 2011 Rüdiger Landmann 1.0-10 +- import 1.0 into Fedora, based on Mandriva package + * Tue Feb 08 2011 Fedora Release Engineering - 1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -134,6 +167,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - set BR on xmlgraphics-commons >= 1.4 - Add qdox classpath +* Thu Dec 09 2010 Paulo Ricardo Zanoni 1.0-0.0.3mdv2011.0 +- Revision: 617684 +- Resubmit after moving + * Fri Dec 3 2010 Stanislav Ochotnicky - 1.0-6 - Add LICENSE to javadoc sub-package - Few other tweaks according to new guidelines @@ -157,46 +194,37 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - 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. +* Sat Sep 04 2010 Tomasz Pawel Gajc 1.0-0.0.2mdv2011.0 +- Revision: 576002 +- rebuild for new xmlgraphics-commons -* Thu Mar 25 2010 Mary Ellen Foster - 0.95-5 -- Add maven depmap fragment -- Add dist to version +* 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 -* Fri Jul 24 2009 Fedora Release Engineering - 0.95-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Thu Apr 29 2010 Tomasz Pawel Gajc 0.95-0.0.3mdv2010.1 +- Revision: 540954 +- rebuild -* Tue Feb 24 2009 Fedora Release Engineering - 0.95-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Sep 11 2009 Thierry Vignaud 0.95-0.0.2mdv2010.0 +- Revision: 437573 +- rebuild -* Fri Feb 6 2009 Alexander Kurtakov 0.95-2 -- Add OSGi manifest (needed for eclipse-birt). +* 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 -* Thu Dec 18 2008 Lubomir Rintel - 0.95-1 -- New upstream release +* Sat Dec 29 2007 David Walluck 0.94-0.2.1mdv2008.1 +- Revision: 139372 +- spec cleanup +- import fop -* 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 +262,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 +272,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 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