Hello community,
here is the log from the commit of package xmlgraphics-batik for
openSUSE:Factory checked in at 2013-09-12 21:43:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-batik (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-batik"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-batik/xmlgraphics-batik.changes
2013-07-16 18:40:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new/xmlgraphics-batik.changes
2013-09-12 21:43:31.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 12 19:08:45 UTC 2013 - tchva...@suse.com
+
+- Kill javadoc to remove unresolvables.
+
+-------------------------------------------------------------------
+Mon Sep 9 11:06:29 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-batik.spec ++++++
--- /var/tmp/diff_new_pack.ioPpH7/_old 2013-09-12 21:43:32.000000000 +0200
+++ /var/tmp/diff_new_pack.ioPpH7/_new 2013-09-12 21:43:32.000000000 +0200
@@ -44,10 +44,8 @@
BuildRequires: ant
BuildRequires: java-devel
-BuildRequires: java-javadoc
BuildRequires: jython
BuildRequires: rhino >= 1.5
-BuildRequires: rhino-javadoc
BuildRequires: xerces-j2
BuildRequires: xml-commons-jaxp-1.3-apis >= 1.3.03
%if %defined suse_version
@@ -66,7 +64,7 @@
Obsoletes: batik-squiggle < %{version}-%{release}
Provides: batik-squiggle = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils >= 1.5
+Requires: javapackages-tools
Requires: xerces-j2 >= 2.3
%description squiggle
@@ -79,7 +77,7 @@
Obsoletes: batik-svgpp < %{version}-%{release}
Provides: batik-svgpp = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils >= 1.5
+Requires: javapackages-tools
Requires: xerces-j2 >= 2.3
%description svgpp
@@ -93,7 +91,7 @@
Obsoletes: batik-ttf2svg < %{version}-%{release}
Provides: batik-ttf2svg = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils >= 1.5
+Requires: javapackages-tools
%description ttf2svg
The SVG Font Converter lets developers convert character ranges from
@@ -107,7 +105,7 @@
Obsoletes: batik-rasterizer < %{version}-%{release}
Provides: batik-rasterizer = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils >= 1.5
+Requires: javapackages-tools
Requires: xerces-j2 >= 2.3
%description rasterizer
@@ -123,21 +121,12 @@
Obsoletes: batik-slideshow < %{version}-%{release}
Provides: batik-slideshow = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils >= 1.5
+Requires: javapackages-tools
Requires: xerces-j2 >= 2.3
%description slideshow
Batik SVG slideshow.
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Productivity/Graphics/Vector Editors
-Obsoletes: batik-javadoc < %{version}-%{release}
-Provides: batik-javadoc = %{version}-%{release}
-
-%description javadoc
-Javadoc for %{name}.
-
%package demo
Summary: Demo for %{name}
Group: Productivity/Graphics/Vector Editors
@@ -159,7 +148,7 @@
%build
export CLASSPATH=
export OPT_JAR_LIST=:
-%{ant} all-jar jars javadoc
+%{ant} all-jar jars
%install
@@ -199,16 +188,6 @@
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/%{name}-rasterizer
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}-slideshow
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr batik-%{version}/docs/javadoc/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} || :
-# FIXME: (dwalluck): This breaks bi --short-circuit
-rm -rf %{name}-%{version}/docs/javadoc
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/batik-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/batik
-
# demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr contrib resources samples test-resources test-sources \
@@ -317,13 +296,6 @@
%{_javadir}/batik-slideshow.jar
%attr(0755,root,root) %{_bindir}/%{name}-slideshow
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
-%{_javadocdir}/batik-%{version}
-%{_javadocdir}/batik
-
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
