Author: pawelz Date: Thu Apr 1 21:46:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.95
- pldized/unified/etc
- it builds, but still needs some work
---- Files affected:
packages/fop:
fop.spec (1.42 -> 1.43)
---- Diffs:
================================================================
Index: packages/fop/fop.spec
diff -u packages/fop/fop.spec:1.42 packages/fop/fop.spec:1.43
--- packages/fop/fop.spec:1.42 Sun Dec 9 02:39:13 2007
+++ packages/fop/fop.spec Thu Apr 1 23:46:25 2010
@@ -1,18 +1,41 @@
# $Revision$, $Date$
+
+# TODO:
+# - Tests are temporarily disabled, because even if all tests passes ant still
+# thinks that some tests failed.
+# - package avalon. This package should not provide it.
+
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+
+%bcond_with tests # perform tests, broken, see TODO
+
+%include /usr/lib/rpm/macros.java
+
Summary: XSL Formatter in Java
Summary(pl.UTF-8): Formater XSL napisany w Javie
Name: fop
-Version: 0.20.5
+Version: 0.95
Release: 1
License: Apache v1.1
Group: Applications/Publishing/XML/Java
Source0:
http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz
-# Source0-md5: 1a31eb1357e5d4b8d32d4cb3edae2da2
+# Source0-md5: 58593e6c86be17d7dc03c829630fd152
Source1: %{name}-font-install.sh
Source2: %{name}.sh
URL: http://xmlgrapics.apache.org/fop/
BuildRequires: batik
-BuildRequires: jdk >= 1.3
+BuildRequires: glibc-localedb-all
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jpackage-utils
+%{?with_tests:BuildRequires: java-junit}
+%{?with_tests:BuildRequires: java-xmlunit}
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xalan-j
BuildRequires: xerces-j
@@ -21,6 +44,7 @@
Requires: jpackage-utils
Requires: xalan-j
Requires: xerces-j
+Patch0: fop-disableX11tests.patch
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,15 +69,25 @@
%prep
%setup -q
+%{?with_tests:%patch0 -p1}
+
%build
required_jars='ant xml-commons-apis xercesImpl xalan batik'
CLASSPATH="%{_jvmlibdir}/java/lib/tools.jar"
-export CLASSPATH="$CLASSPATH:`/usr/bin/build-classpath $required_jars`"
+CLASSPATH="$CLASSPATH:$(/usr/bin/build-classpath $required_jars)"
export JAVA_HOME=%{java_home}
export JAVAC=%{javac}
export JAVA=%{java}
-%ant
+export LC_ALL=en_US # source code not US-ASCII
+
+%ant package servlet transcoder-pkg
+
+%if %{with tests}
+required_jars='xmlunit junit'
+CLASSPATH="$CLASSPATH:$(/usr/bin/build-classpath $required_jars)"
+%ant -Dbuild.sysclasspath=first
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -66,7 +100,13 @@
# create empty config file
echo > $RPM_BUILD_ROOT%{_fontsdir}/fop-font.config
-install lib/avalon-framework-cvs-20020806.jar build/fop.jar
$RPM_BUILD_ROOT%{_javadir}
+# TODO ugly, ugly, ugly hack
+install lib/avalon-framework-4.2.0.jar $RPM_BUILD_ROOT%{_javadir}
+
+# jars
+cp -a build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -76,7 +116,7 @@
%files
%defattr(644,root,root,755)
-%doc CHANGES README STATUS
+%doc KEYS README
%dir %{_fop_font_metrics}
%attr(755,root,root) %{_bindir}/*
%{_javadir}/*.jar
@@ -88,6 +128,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43 2010/04/01 21:46:25 pawelz
+- up to 0.95
+- pldized/unified/etc
+- it builds, but still needs some work
+
Revision 1.42 2007/12/09 01:39:13 glen
- R: jpackage-utils for %{_javadir}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fop/fop.spec?r1=1.42&r2=1.43&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
