[fop/f15/master] Build last known good version

Tue Feb 15 04:04:39 UTC 2011

commit bd5fce21d171a5002a93fb7b489de367634113b6
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Tue Feb 15 14:05:55 2011 +1000

    Build last known good version

 fop-1.0.pom        |  150 ----------------------------------------------------
 fop-manifest.patch |   22 ++++++++
 fop.spec           |  116 ++++++++++++++---------------------------
 sources            |    1 -
 4 files changed, 61 insertions(+), 228 deletions(-)
---

diff --git a/fop-manifest.patch b/fop-manifest.patch
new file mode 100644
index 0000000..7208469
--- /dev/null
+++ b/fop-manifest.patch
@@ -0,0 +1,22 @@
+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 @@
+       <map from="${optional.lib.dir}${file.separator}" to=""/>
+     </pathconvert>
+ 
+-    <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}">
++    <jar jarfile="${build.dir}/fop.jar" 
++	basedir="${build.classes.dir}"
++	manifest="${basedir}/fop.mf">
+       <manifest>
+-        <attribute name="Main-Class" value="org.apache.fop.cli.Main"/>
+-        <attribute name="Class-Path" value="${manifest.classpath}"/>
+         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
+         <section name="org/apache/fop/">
+           <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/>
+--- 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 @@
++Manifest-Version: 1.0
++Main-Class: org.apache.fop.cli.Main
diff --git a/fop.spec b/fop.spec
index 4fb7e9a..be828bd 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,40 +1,34 @@
 Summary:        XSL-driven print formatter
 Name:           fop
-Version:        1.0
-Release:        9%{?dist}
+Version:        0.95
+Release:        5%{?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
+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:       apache-commons-io >= 1.2
-Requires:       apache-commons-logging >= 1.0.4
-Requires:       java >= 1:1.6.0
+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-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
-
+BuildRequires:  ant-trax
+BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires:  java-1.6.0-openjdk-javadoc
 BuildArch:      noarch
 
 %description
@@ -48,7 +42,6 @@ XT) SAX events.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -56,17 +49,21 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
-
-%patch0 -p0
+%patch0 -p1
+%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)
+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
 
 %install
+rm -rf $RPM_BUILD_ROOT
 # inject OSGi manifests
 mkdir -p META-INF
 cp -p %{SOURCE2} META-INF/MANIFEST.MF
@@ -75,8 +72,13 @@ 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}.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}
+for jar in *-%{version}*
+do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+done
+popd
 
 # script
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -87,17 +89,14 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr conf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+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 $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}
 
-%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 $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
@@ -109,57 +108,20 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README NOTICE
-%{_javadir}/%{name}.jar
-%{_javadir}/pdf-transcoder.jar
+%{_javadir}/%{name}*.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}-%{version}
 %doc %{_javadocdir}/%{name}
 
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 4 2011 Rüdiger Landmann <r.landmann at redhat.com> - 1.0-8
-- BR qdox
-
-* Tue Jan 4 2011 Rüdiger Landmann <r.landmann at redhat.com> - 1.0-7
-- set BR on xmlgraphics-commons >= 1.4
-- Add qdox classpath
-
-* Fri Dec 3 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 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 <akurtako at redhat.com> 1.0-5
-- We need servlet not jsp.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-4
-- BR jsp.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-3
-- Add more BRs.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-2
-- BR ant-nodeps.
-
-* 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.
-
 * Thu Mar 25 2010 Mary Ellen Foster <mefoster at gmail.com> - 0.95-5
 - Add maven depmap fragment
 - Add dist to version
@@ -234,7 +196,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 * Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.20.5-4jpp
 - Upgrade to Ant 1.6.X
 
-* Thu Jan  8 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.20.5-3jpp
+* Thu Jan  8 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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 +206,17 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 - Remove class path in manifest
 - New javadoc style
 
-* Sat Jul 19 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.20.5-1jpp
+* Sat Jul 19 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 0:0.20.5-0.rc3a.1jpp
+* Sat Jun  7 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 0:0.20.5-0.rc2.1jpp
+* Thu Apr 17 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.20.5-0.rc2.1jpp
 - Update to 0.20.5rc2 and JPackage 1.5.
 
 * Sun Mar 10 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 0.20.3-1jpp
diff --git a/sources b/sources
index 44ffcc2..9da02a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 58593e6c86be17d7dc03c829630fd152  fop-0.95-src.tar.gz
-95dcc4c2dd08b4bc88ce9ce1ee88c439  fop-1.0-src.tar.gz
