SPECS (DEVEL): fop.spec - up to 0.95 - merged changes from HEAD - it compil...

[pawelz]

Author: pawelz                       Date: Mon Dec 29 01:58:30 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 0.95
- merged changes from HEAD
- it compiles, but some tests fails: see TODO

---- Files affected:
SPECS:
   fop.spec (1.36.2.1 -> 1.36.2.2) 

---- Diffs:

================================================================
Index: SPECS/fop.spec
diff -u SPECS/fop.spec:1.36.2.1 SPECS/fop.spec:1.36.2.2
--- SPECS/fop.spec:1.36.2.1	Mon Feb 12 14:20:12 2007
+++ SPECS/fop.spec	Mon Dec 29 02:58:24 2008
@@ -1,32 +1,31 @@
 # $Revision$, $Date$
+# TODO:
+# - Some test fails. Reason of some failures is obvious:
+#   [junit] No X11 DISPLAY variable was set, but this program performed an operation which requires it.
+#   what should we do? Skip these tests? Skip all tests? add bcond --without test?
+#
 Summary:	XSL Formatter in Java
-Summary(pl.UTF-8):   Formater XSL napisany w Javie
+Summary(pl.UTF-8):	Formater XSL napisany w Javie
 Name:		fop
-Version:	0.92
-%define	_snap	409208
-Release:	0.%{_snap}.1
+Version:	0.95
+Release:	0.1
 License:	Apache v1.1
 Group:		Applications/Publishing/XML/Java
-#Source0:	http://www.apache.org/dist/xml/fop/source/%{name}-%{version}-src.tar.bz2
-# http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_92/
-Source0:	%{name}-%{_snap}-svn.tar.bz2
-# Source0-md5:	50ecf2fd3b474b83ca95f4489fd28b3c
+Source0:	http://archive.apache.org/dist/xmlgraphics/fop/source/fop-0.95-src.zip
+# Source0-md5:	adeb416f81125d8554a621050f319632
 Source1:	%{name}-font-install.sh
 Source2:	%{name}.sh
-URL:		http://xml.apache.org/fop/
-BuildRequires:	avalon-framework
+URL:		http://xmlgrapics.apache.org/fop/
 BuildRequires:	batik
-BuildRequires:	jce
 BuildRequires:	jdk >= 1.3
-BuildRequires:	jeuclid
 BuildRequires:	junit
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xalan-j
 BuildRequires:	xerces-j
-BuildRequires:	xmlunit
 Requires:	batik
 Requires:	freetype1
-Requires:	jre >= 1.3
+Requires:	jpackage-utils
+Requires:	jre
 Requires:	xalan-j
 Requires:	xerces-j
 BuildArch:	noarch
@@ -51,17 +50,17 @@
 dokument DOM lub (w przypadku XT) zdarzenia SAX.
 
 %prep
-%setup -q -n %{name}-svn
+%setup -q
 
 %build
-required_jars='ant xml-commons-apis xercesImpl xalan batik junit xmlunit commons-io xmlgraphics-commons servlet jce'
+required_jars='ant xml-commons-apis xercesImpl xalan batik'
 CLASSPATH="%{_jvmlibdir}/java/lib/tools.jar"
 export CLASSPATH="$CLASSPATH:`/usr/bin/build-classpath $required_jars`"
 export JAVA_HOME=%{java_home}
 export JAVAC=%{javac}
 export JAVA=%{java}
 
-%{ant}
+%ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,7 +86,7 @@
 %doc CHANGES README STATUS
 %dir %{_fop_font_metrics}
 %attr(755,root,root) %{_bindir}/*
-%{_javadir}/*
+%{_javadir}/*.jar
 %{_fontsdir}/*.config
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -96,17 +95,29 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.36.2.1  2007/02/12 13:20:12  baggins
-- converted to UTF-8
+Revision 1.36.2.2  2008/12/29 01:58:24  pawelz
+- up to 0.95
+- merged changes from HEAD
+- it compiles, but some tests fails: see TODO
+
+Revision 1.42  2007/12/09 01:39:13  glen
+- R: jpackage-utils for %{_javadir}
+
+Revision 1.41  2007-03-31 21:37:51  qboosh
+- updated URLs
 
-Revision 1.36  2006/05/28 08:20:33  qboosh
-- sorted BRs
+Revision 1.40  2007/02/13 07:16:44  glen
+- tabs in preamble
+
+Revision 1.39  2007/02/12 00:48:34  baggins
+- converted to UTF-8
 
-Revision 1.35  2006/05/24 22:01:12  radek
-- trunk snap, BR: avalon-framework jeuclid, required_jars+=jce
+Revision 1.38  2006/09/12 14:17:20  glen
+- unify %ant macro
 
-Revision 1.34  2006/05/24 20:04:44  radek
-- version 0.92 from svn, more required_jars; still doesn't build
+Revision 1.37  2006/09/11 13:06:39  baggins
+- back to 0.20.5
+- not working, not building snap moved to DEVEL
 
 Revision 1.33  2006/05/23 20:34:37  glen
 - rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fop.spec?r1=1.36.2.1&r2=1.36.2.2&f=u