Author: pawelz Date: Sat Apr 3 19:21:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- renamed from fop
- subpackage -n fop, that provides fop cmdline utility
- dropped gcj support
- some cleanup and dependency fixes
---- Files affected:
packages/java-xmlgraphics-fop:
java-xmlgraphics-fop.spec (1.44 -> 1.45)
---- Diffs:
================================================================
Index: packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec
diff -u packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.44
packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.45
--- packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.44 Fri Apr
2 00:59:12 2010
+++ packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec Sat Apr 3
21:21:48 2010
@@ -3,29 +3,23 @@
# 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
+%define srcname xmlgraphics-fop
Summary: XSL Formatter in Java
Summary(pl.UTF-8): Formater XSL napisany w Javie
-Name: fop
+Name: java-xmlgraphics-fop
Version: 0.95
Release: 1
-License: Apache v1.1
+License: Apache v2.0
Group: Applications/Publishing/XML/Java
-Source0:
http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz
+Source0:
http://www.apache.org/dist/xmlgraphics/fop/source/fop-%{version}-src.tar.gz
# Source0-md5: 58593e6c86be17d7dc03c829630fd152
-Source1: %{name}-font-install.sh
-Source2: %{name}.sh
+Source1: fop-font-install.sh
+Source2: fop.sh
URL: http://xmlgrapics.apache.org/fop/
BuildRequires: batik
BuildRequires: glibc-localedb-all
@@ -40,15 +34,15 @@
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: batik
-Requires: commons-io
Requires: freetype1
+Requires: java-commons-io
Requires: java-xalan
Requires: java-xerces
Requires: java-xerces
+Requires: java-xmlgraphics-commons
Requires: jpackage-utils
Requires: ttmkfdir
-Requires: xmlgraphics-commons
-Patch0: %{name}-disableX11tests.patch
+Patch0: fop-disableX11tests.patch
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,8 +64,17 @@
silnika XSLT takiego jak XT lub Xalan) lub być przekazane jako
dokument DOM lub (w przypadku XT) zdarzenia SAX.
+%package -n fop
+Summary: fop commandline utility
+Group: Applications/Publishing
+Requires: %{name} = %{version}-%{release}
+
+%description -n fop
+Shell script that allows to use java-xmlgraphics-fop as standalone
+application.
+
%prep
-%setup -q
+%setup -q -n fop-%{version}
%{?with_tests:%patch0 -p1}
@@ -104,12 +107,9 @@
# create empty config file
echo > $RPM_BUILD_ROOT%{_fontsdir}/fop-font.config
-# 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
+cp -a build/fop.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
%clean
@@ -122,9 +122,13 @@
%defattr(644,root,root,755)
%doc KEYS README
%dir %{_fop_font_metrics}
-%attr(755,root,root) %{_bindir}/*
%{_javadir}/*.jar
%{_fontsdir}/*.config
+%attr(755,root,root) %{_bindir}/fop-font-install
+
+%files -n fop
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fop
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -132,6 +136,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2010/04/03 19:21:48 pawelz
+- renamed from fop
+- subpackage -n fop, that provides fop cmdline utility
+- dropped gcj support
+- some cleanup and dependency fixes
+
Revision 1.44 2010/04/01 22:59:12 pawelz
- dependencies
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec?r1=1.44&r2=1.45&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
