rpms/fop/devel fop-build.patch, NONE, 1.1 fop-main.patch, NONE, 1.1 fop-manifest.patch, NONE, 1.1 fop.spec, NONE, 1.1
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Tue Nov 27 14:33:38 UTC 2007
Author: langel
Update of /cvs/pkgs/rpms/fop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537
Added Files:
fop-build.patch fop-main.patch fop-manifest.patch fop.spec
Log Message:
* Fri Nov 23 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed rpmlint errors.
fop-build.patch:
--- NEW FILE fop-build.patch ---
--- fop-0.94/build.xml 2007-08-18 19:56:46.000000000 -0400
+++ fop-0.94-working/build.xml 2007-09-17 13:45:19.000000000 -0400
@@ -1008,7 +1008,7 @@
<mkdir dir="${build.javadocs.dir}"/>
<javadoc
- executable="${javahome.jdk14}/bin/javadoc"
+ executable="${env.JAVA_HOME}/bin/javadoc"
packagenames="${javadoc.packages}"
destdir="${build.javadocs.dir}"
author="true"
fop-main.patch:
--- NEW FILE fop-main.patch ---
--- ../../orig/fop-0.94/src/java/org/apache/fop/cli/Main.java 2007-08-18 13:56:46.000000000 -0400
+++ src/java/org/apache/fop/cli/Main.java 2007-09-18 09:19:53.000000000 -0400
@@ -193,11 +193,7 @@
* @param args the command line parameters
*/
public static void main(String[] args) {
- if (checkDependencies()) {
- startFOP(args);
- } else {
- startFOPWithDynamicClasspath(args);
- }
+ startFOP(args);
}
}
fop-manifest.patch:
--- NEW FILE fop-manifest.patch ---
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
--- NEW FILE fop.spec ---
Summary: XSL-driven print formatter
Name: fop
Version: 0.94
Release: 1
License: ASL 2.0
Group: Applications/Text
Source0: fop-0.94-src.tar.gz
Source1: %{name}.script
Patch0: %{name}-build.patch
Patch1: %{name}-manifest.patch
Patch2: %{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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: ant-trax
BuildRequires: java-1.7.0-icedtea-devel
BuildRequires: java-1.7.0-icedtea-javadoc
BuildArch: noarch
%description
FOP is the world's first print formatter driven by XSL formatting
objects. It is a Java application that reads a formatting object tree
and then turns it into a PDF document. The formatting object tree, can
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
%description javadoc
Javadoc for %{name}.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p0
%build
export ANT_HOME=/usr/share/ant
export JAVA_HOME=/usr/lib/jvm/java-icedtea
export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax-1.7.0.jar
ant clean jar-main transcoder-pkg javadocs
%install
rm -rf $RPM_BUILD_ROOT
# 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}
for jar in *-%{version}*
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
done
popd
# script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fop
# data
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr conf $RPM_BUILD_ROOT%{_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}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE README NOTICE
%{_javadir}/%{name}*.jar
%{_datadir}/%{name}
%{_javadir}/pdf-transcoder.jar
%attr(0755,root,root) %{_bindir}/fop
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
* Fri Nov 23 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed rpmlint errors.
* Tue Sep 18 2007 Joshua Sumali <jsumali at redhat.com> - 0:0.94-1
- Update to fop 0.94
* Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-9jpp
- First build for JPP-1.7
- Replace avalon-framework, avalon-logkit with their new excalibur-*
counterparts
- Drop non-free jimi and jai BRs
* Tue Oct 11 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-8jpp
- Patch to Batik >= 1.5.1
* Fri Oct 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-7jpp
- Omit ant -d flag
* Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-6jpp
- Build with ant-1.6.2
* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-5jpp
- Void change
* 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
- BuildRequires ant-optional.
- Crosslink with full J2SE javadocs instead of just JAXP/XML-commons.
- Add Main-Class back to manifest.
* Tue Sep 23 2003 Paul Nasrat <pauln at truemesh.com> - 0:0.20.5-2jpp
- Fix script and requires
- Remove class path in manifest
- New javadoc style
* 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
- 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
- Update to 0.20.5rc2 and JPackage 1.5.
* Sun Mar 10 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 0.20.3-1jpp
- 0.20.3 final
- fixed missing symlink
* Mon Jan 21 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 0.20.3-0.rc.1jpp
- 0.20.3rc
- first unified release
- javadoc into javadoc package
- no dependencies for manual package
- s/jPackage/JPackage
- adaptation to new xalan-j2 package
- requires and buildrequires avalon-logkit
* Thu Aug 30 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 0.20.1-1mdk
- first release
More information about the fedora-extras-commits
mailing list