From f6e89d0cd9c0afbe4cedfb7f3af6c83edad6506f Mon Sep 17 00:00:00 2001 From: Ruediger Landmann Date: Mar 10 2011 05:58:05 +0000 Subject: * Thu Mar 10 2011 Rüdiger Landmann 1.0-13 - reinstate updated manifest patch - change define to global --- diff --git a/.gitignore b/.gitignore index 71ee9dc..afa5e11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ fop-0.95-src.tar.gz +/fop-1.0-src.tar.gz 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-manifest.patch b/fop-manifest.patch index 7208469..d1e23a9 100644 --- a/fop-manifest.patch +++ b/fop-manifest.patch @@ -1,22 +1,25 @@ -diff -uN fop-0.94/build.xml fop-0.94-mod/build.xml ---- fop-0.94/build.xml 2007-08-18 19:56:46.000000000 -0400 -+++ fop-0.94-mod/build.xml 2007-09-17 16:41:01.000000000 -0400 -@@ -502,10 +502,10 @@ - +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 @@ + + - - + ++ basedir="${build.classes.dir}" ++ manifest="${basedir}/fop.mf"> - - - +
---- fop-0.94/fopmf.old 2007-11-23 10:53:31.000000000 -0500 -+++ fop-0.94/fop.mf 2007-11-23 10:53:18.000000000 -0500 -@@ -0,0 +1,2 @@ + +--- 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..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 770ed77..3b81886 100644 --- a/fop.spec +++ b/fop.spec @@ -1,35 +1,33 @@ -Summary: XSL-driven print formatter -Name: fop -Version: 0.95 -Release: 6%{?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 -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 +%global gcj_support 0 + +Summary: XSL-driven print formatter +Name: fop +Version: 1.0 +Release: 13%{?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 +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: jakarta-commons-io >= 1.2 +Requires: jakarta-commons-logging >= 1.0.4 Requires: java-1.6.0-openjdk - -Requires(post): jpackage-utils -Requires(postun): jpackage-utils - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant -BuildRequires: ant-trax +Requires: jpackage-utils +BuildRequires: ant +BuildRequires: ant-trax BuildRequires: java-1.6.0-openjdk-devel BuildRequires: java-1.6.0-openjdk-javadoc -BuildArch: noarch +BuildRequires: jpackage-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description FOP is the world's first print formatter driven by XSL formatting @@ -39,129 +37,166 @@ 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 +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Java %description javadoc Javadoc for %{name}. - %prep %setup -q %patch0 -p1 %patch1 -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 -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 -rm -rf $RPM_BUILD_ROOT -# 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}-%{version}.jar -cp -p build/%{name}-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/pdf-transcoder.jar -pushd $RPM_BUILD_ROOT%{_javadir} +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 -sf ${jar} `echo $jar| sed "s|-%{version}||g"` +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}-%{version} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -a build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name} %{version} +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif %clean -rm -rf $RPM_BUILD_ROOT +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 %{_datadir}/%{name} %{_javadir}/pdf-transcoder.jar -%{_mavendepmapfragdir}/* %attr(0755,root,root) %{_bindir}/fop - +%if %{gcj_support} +%dir %{_libdir}/gcj/%{name} +%{_libdir}/gcj/%{name}/* +%endif %files javadoc -%defattr(-,root,root,-) +%defattr(-,root,root) %doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %changelog -* Mon May 31 2010 Ville Skyttä - 0.95-6 -- Fix specfile encoding. +* 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 25 2010 Mary Ellen Foster - 0.95-5 -- Add maven depmap fragment -- Add dist to version +* Thu Mar 10 2011 Rüdiger Landmann 1.0-11 +- drop obsolete manifest patch -* Fri Jul 24 2009 Fedora Release Engineering - 0.95-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Wed Mar 10 2011 Rüdiger Landmann 1.0-10 +- import 1.0 into Fedora, based on Mandriva package -* Tue Feb 24 2009 Fedora Release Engineering - 0.95-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Feb 08 2011 Fedora Release Engineering - 1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Fri Feb 6 2009 Alexander Kurtakov 0.95-2 -- Add OSGi manifest (needed for eclipse-birt). +* Tue Jan 4 2011 Rüdiger Landmann - 1.0-8 +- BR qdox -* Thu Dec 18 2008 Lubomir Rintel - 0.95-1 -- New upstream release +* Tue Jan 4 2011 Rüdiger Landmann - 1.0-7 +- set BR on xmlgraphics-commons >= 1.4 +- Add qdox classpath -* Wed Apr 2 2008 Lillian Angel - 0.95.0.2.beta1 -- Updated release. +* Thu Dec 09 2010 Paulo Ricardo Zanoni 1.0-0.0.3mdv2011.0 +- Revision: 617684 +- Resubmit after moving -* Tue Apr 1 2008 Lillian Angel - 0.95.0.1.beta1 -- Added CLASSPATH to fop.script. +* 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) -* Mon Mar 31 2008 Lillian Angel - 0.95.0.1.beta1 -- Updated sources to 0.95 beta. -- Updated patches. -- Updated release. +* Fri Oct 1 2010 Alexander Kurtakov 1.0-5 +- We need servlet not jsp. -* Mon Mar 31 2008 Lillian Angel - 0.94.4 -- Updated CLASSPATH. -- Updated release. +* Fri Oct 1 2010 Alexander Kurtakov 1.0-4 +- BR jsp. -* Mon Mar 31 2008 Lillian Angel - 0.94.3 -- Fixed JAVA_HOME to point to openjdk, instead of icedtea. +* Fri Oct 1 2010 Alexander Kurtakov 1.0-3 +- Add more BRs. + +* 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. + +* 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 -* 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. @@ -199,7 +234,7 @@ rm -rf $RPM_BUILD_ROOT * 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. @@ -209,17 +244,17 @@ rm -rf $RPM_BUILD_ROOT - 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 @@ -237,3 +272,4 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 30 2001 Guillaume Rousse 0.20.1-1mdk - first release + diff --git a/sources b/sources index 9da02a2..49c53ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58593e6c86be17d7dc03c829630fd152 fop-0.95-src.tar.gz +95dcc4c2dd08b4bc88ce9ce1ee88c439 fop-1.0-src.tar.gz