Hello community, here is the log from the commit of package ant-contrib for openSUSE:Factory checked in at 2013-08-30 11:32:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant-contrib (Old) and /work/SRC/openSUSE:Factory/.ant-contrib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant-contrib" Changes: -------- --- /work/SRC/openSUSE:Factory/ant-contrib/ant-contrib.changes 2011-09-23 11:36:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes 2013-08-30 11:32:34.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 22 12:02:04 UTC 2013 - mvysko...@suse.com + +- disable javadoc build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-contrib.spec ++++++ --- /var/tmp/diff_new_pack.1KZd6h/_old 2013-08-30 11:32:36.000000000 +0200 +++ /var/tmp/diff_new_pack.1KZd6h/_new 2013-08-30 11:32:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ant-contrib # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,20 +14,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 + %define with_junit 0 %define section free %define ant_minimal_version 1.7.1 Summary: Collection of tasks for Ant +License: Apache-2.0 +Group: Development/Libraries/Java Name: ant-contrib Version: 1.0b2 -Release: 47 -License: Apache-2.0 +Release: 0 Url: http://ant-contrib.sourceforge.net/ -Group: Development/Libraries/Java Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-1.0b2-src.tar.bz2 #Is from apache-ant-1.7.0-src.zip Source1: BuildFileTest.java @@ -36,10 +36,10 @@ Patch2: ant-contrib-BuildFileTest_java.patch #PATCH-FIX-OPENSUSE: bnc#644661 Patch3: ant-contrib-1.0b2-enable-for-task.patch -BuildRequires: jpackage-utils >= 1.6 BuildRequires: ant >= %{ant_minimal_version} BuildRequires: bcel >= 5.1 BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: jpackage-utils >= 1.6 %if %{with_junit} BuildRequires: ant-junit >= %{ant_minimal_version} Requires: junit >= 3.8.1 @@ -53,23 +53,7 @@ The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant. - - -%package javadoc -License: Apache-2.0 -Summary: Collection of tasks for Ant -Group: Development/Libraries/Java -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm - -%description javadoc -The Ant-Contrib project is a collection of tasks (and at one point -maybe types and other tools) for Apache Ant. - - - %package manual -License: Apache-2.0 Summary: Collection of tasks for Ant Group: Development/Libraries/Java @@ -77,13 +61,14 @@ The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant. - - %prep %setup -q -c -n %{name}-%{version} for j in $(find . -name "*.jar"); do mv $j $j.no done + +mv ant-contrib/manual/LICENSE.txt . + # TODO: this test fails #rm ant-contrib/test/src/net/sf/antcontrib/logic/TryCatchTaskTest.java %patch0 -b .sav @@ -105,7 +90,7 @@ export CLASSPATH=$(build-classpath bcel junit) %endif ant \ - all \ + jar \ %if %{with_junit} test %endif @@ -115,38 +100,16 @@ install -Dpm 644 %{name}/build/lib/%{name}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -# javadoc -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr %{name}/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink -rm -rf %{name}/build/docs/api # manual install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr %{name}/build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi %files %defattr(0644,root,root,0755) +%doc LICENSE.txt %{_javadir}/*.jar -%doc %{_docdir}/%{name}-%{version}/LICENSE.txt - -%files javadoc -%defattr(-,root,root,-) -%doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} %files manual %defattr(-,root,root,-) -%doc %{_docdir}/%{name}-%{version} -%exclude %{_docdir}/%{name}-%{version}/LICENSE.txt -# ----------------------------------------------------------------------------- +%doc %{name}/manual %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
