From e54856e3f5c545ecab835751bd3aa8742987836eca17f88bc7ae77f56e6c152c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Sep 2013 21:17:04 +0000 Subject: [PATCH] - Drop javadoc package so we build this package OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=40 --- xmlgraphics-fop.changes | 5 +++++ xmlgraphics-fop.spec | 19 ------------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index a6a0005..2b36705 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 12 21:16:29 UTC 2013 - tchvatal@suse.com + +- Drop javadoc package so we build this package + ------------------------------------------------------------------- Mon Sep 9 11:06:30 UTC 2013 - tchvatal@suse.com diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index f3b87a0..fc5c093 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -65,7 +65,6 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: gpg-offline BuildRequires: gpg2 BuildRequires: java-devel >= 1.6.0 -BuildRequires: java-javadoc BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: libxslt @@ -74,7 +73,6 @@ BuildRequires: servlet_api BuildRequires: unzip BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xmlgraphics-batik -BuildRequires: xmlgraphics-batik-javadoc BuildRequires: xmlgraphics-commons >= 1.5 BuildRequires: xmlunit BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,14 +89,6 @@ tree and renders the resulting pages to one of the following output formats: PDF (primary output target), PCL, PS, SVG, XML (area tree representation), Print, AWT, MIF, and TXT. -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation/HTML - -%description javadoc -API documentation for %{name} automatically extracted from comments in source files. - - %prep %gpg_verify %{SOURCE1000} %setup -q -n %{bname}-%{version} -a5 @@ -143,7 +133,6 @@ popd export CLASSPATH= LANG=en_US.UTF-8 export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}` %{ant} \ - -Dbatik.javadoc=%{_javadocdir}/xmlgraphics-batik \ package \ %if %{with tests} junit \ @@ -186,10 +175,6 @@ cp -pr hyph %{buildroot}%{_datadir}/%{name} cp -pr conf %{buildroot}%{_datadir}/%{name} install -D -m 644 conf/fop.xconf %{buildroot}/etc/fop.xconf -# javadoc -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} - # Manpages mkdir -p %{buildroot}%_mandir/man1 for m in *.1; do @@ -222,8 +207,4 @@ popd %{_mandir}/man1/* %config(noreplace) /etc/fop.xconf -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name} - %changelog