Author: glen Date: Sat Apr 14 00:26:04 2012 GMT Module: packages Tag: HEAD ---- Log message: - add R(post) deps, hopefully solves first install errors: http://carme.pld-linux.org/~glen/fop-install-sequence.txt
---- Files affected: packages/java-xmlgraphics-fop: java-xmlgraphics-fop.spec (1.63 -> 1.64) ---- Diffs: ================================================================ Index: packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec diff -u packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.63 packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.64 --- packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.63 Thu Oct 13 20:06:54 2011 +++ packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec Sat Apr 14 02:25:58 2012 @@ -1,5 +1,4 @@ # $Revision$, $Date$ - # TODO: # - Tests are temporarily disabled, because even if all tests passes ant still # thinks that some tests failed. @@ -10,14 +9,13 @@ %bcond_with tests # perform tests, broken, see TODO -%include /usr/lib/rpm/macros.java - %define srcname xmlgraphics-fop +%include /usr/lib/rpm/macros.java Summary: XSL Formatter in Java Summary(pl.UTF-8): Formater XSL napisany w Javie Name: java-xmlgraphics-fop Version: 1.0 -Release: 1 +Release: 2 License: Apache v2.0 Group: Libraries/Java Source0: http://www.apache.org/dist/xmlgraphics/fop/source/fop-%{version}-src.tar.gz @@ -37,11 +35,14 @@ BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 +Requires(post): java-commons-io +Requires(post): java-xmlgraphics-commons +Requires(post): java-xml-commons-external Requires: fonts-TTF-RedHat-liberation Requires: freetype1 -Requires: java-commons-logging Requires: java-avalon-framework Requires: java-commons-io +Requires: java-commons-logging Requires: java-xalan Requires: java-xerces Requires: java-xmlgraphics-batik @@ -108,11 +109,11 @@ install -d $RPM_BUILD_ROOT{%{_javadir},%{_fop_font_metrics},%{_bindir}} \ $RPM_BUILD_ROOT%{_fontsdir} -install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fop-font-install -install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fop +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fop-font-install +install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fop # jars -cp -a build/fop.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar +cp -p build/fop.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar touch $RPM_BUILD_ROOT%{_fop_font_metrics}/fop-font.config @@ -142,6 +143,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.64 2012/04/14 00:25:58 glen +- add R(post) deps, hopefully solves first install errors: http://carme.pld-linux.org/~glen/fop-install-sequence.txt + Revision 1.63 2011/10/13 18:06:54 zawadaa - up to 1.0 - add req for basic ttf fonts - for clean install @@ -253,7 +257,7 @@ - license: apache v1.1, removed LICENSE Revision 1.30 2004/08/16 10:48:28 luzik - - updated to 0.20.5 +- updated to 0.20.5 Revision 1.29 2003/11/08 23:04:25 qboosh - updated Source0 URL (but only newer version there) @@ -271,11 +275,11 @@ - release 3 - license fix, new doc Revision 1.24 2002/04/25 16:18:49 arturs -fixed a small typo +- fixed a small typo Revision 1.23 2002/03/12 18:57:02 aflinta - - corrected JAVA_HOME initialization to proper directory - - release 2 +- corrected JAVA_HOME initialization to proper directory +- release 2 Revision 1.22 2002/02/23 02:06:14 kloczek - adapterized. @@ -295,7 +299,7 @@ - use system xalan, xerces and batik Revision 1.17 2002/01/18 02:12:57 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.16 2001/11/27 10:08:23 qboosh - pl description ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec?r1=1.63&r2=1.64 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
