commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2018-07-24 17:30:08
Comparing /work/SRC/openSUSE:Factory/ant-contrib (Old)
and /work/SRC/openSUSE:Factory/.ant-contrib.new (New)
Package is "ant-contrib"
Tue Jul 24 17:30:08 2018 rev:26 rq:620741 version:1.0b3
Changes:
--- /work/SRC/openSUSE:Factory/ant-contrib/ant-contrib.changes 2017-09-13
22:18:51.444559006 +0200
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2018-07-24 17:30:12.563897034 +0200
@@ -1,0 +2,7 @@
+Tue May 15 05:45:46 UTC 2018 - fst...@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+ of 1.6 compatibility
+- Run fdupes on the documentation
+
+---
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.jKpXZh/_old 2018-07-24 17:30:13.195897833 +0200
+++ /var/tmp/diff_new_pack.jKpXZh/_new 2018-07-24 17:30:13.203897843 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ant-contrib
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Summary:Collection of tasks for Ant
License:Apache-2.0
Group: Development/Libraries/Java
-Url:http://ant-contrib.sourceforge.net/
+URL:http://ant-contrib.sourceforge.net/
Source0:
http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
Source1:
http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
# ASL 2.0 Licence text
@@ -38,7 +38,8 @@
BuildRequires: bcel >= 5.1
BuildRequires: commons-httpclient
BuildRequires: commons-logging
-BuildRequires: java-devel >= 1.6
+BuildRequires: fdupes
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
@@ -46,7 +47,6 @@
Requires: junit >= 3.8.1
Requires: xerces-j2
%requires_eqant
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -94,6 +94,7 @@
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
echo "ant/ant-contrib" > %{buildroot}%{_sysconfdir}/ant.d/ant-contrib
@@ -106,19 +107,19 @@
%files
%defattr(0644,root,root,0755)
-%doc target/docs/LICENSE.txt LICENSE-2.0.txt
+%license target/docs/LICENSE.txt
+%doc LICENSE-2.0.txt
%config %{_sysconfdir}/ant.d/%{name}
%{_javadir}/ant/%{name}.jar
%{_mavenpomdir}/JPP.ant-%{name}.pom
%{_datadir}/maven-metadata/%{name}.xml
%files manual
-%defattr(-,root,root,-)
%doc target/docs/manual/tasks/*
%files javadoc
-%defattr(-,root,root,-)
-%doc target/docs/LICENSE.txt LICENSE-2.0.txt
+%license target/docs/LICENSE.txt
+%doc LICENSE-2.0.txt
%doc %{_javadocdir}/%{name}
%changelog
++ ant-contrib-sourcetarget.patch ++
--- /var/tmp/diff_new_pack.jKpXZh/_old 2018-07-24 17:30:13.295897959 +0200
+++ /var/tmp/diff_new_pack.jKpXZh/_new 2018-07-24 17:30:13.295897959 +0200
@@ -6,5 +6,5 @@
ivy.deliver.revision=${project.version}
-jdk.source=1.4
-jdk.target=1.4
-+jdk.source=1.6
-+jdk.target=1.6
++jdk.source=8
++jdk.target=8
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2017-09-13 22:18:50
Comparing /work/SRC/openSUSE:Factory/ant-contrib (Old)
and /work/SRC/openSUSE:Factory/.ant-contrib.new (New)
Package is "ant-contrib"
Wed Sep 13 22:18:50 2017 rev:25 rq:521764 version:1.0b3
Changes:
--- /work/SRC/openSUSE:Factory/ant-contrib/ant-contrib.changes 2017-05-31
13:28:46.112595000 +0200
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2017-09-13 22:18:51.444559006 +0200
@@ -1,0 +2,8 @@
+Wed Sep 6 18:17:00 UTC 2017 - fst...@suse.com
+
+- Added patch:
+ * ant-contrib-sourcetarget.patch
+- build with java source and target 1.6
+- fixes the build with java 9
+
+---
New:
ant-contrib-sourcetarget.patch
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.nYf5Jh/_old 2017-09-13 22:18:52.360430067 +0200
+++ /var/tmp/diff_new_pack.nYf5Jh/_new 2017-09-13 22:18:52.364429504 +0200
@@ -32,12 +32,13 @@
Patch1: ant-contrib-antservertest.patch
Patch2: ant-contrib-pom.patch
Patch3: ant-contrib-1.0b3-enable-for-task.patch
+Patch4: ant-contrib-sourcetarget.patch
BuildRequires: ant
BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1
BuildRequires: commons-httpclient
BuildRequires: commons-logging
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
@@ -75,6 +76,7 @@
%patch1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
++ ant-contrib-sourcetarget.patch ++
--- ant-contrib/build.properties2006-11-02 17:46:26.0 +0100
+++ ant-contrib/build.properties2017-09-06 20:13:43.067914247 +0200
@@ -3,5 +3,5 @@
jar.name=${project.name}.jar
jar.name.versioned=${project.name}-${project.version}.jar
ivy.deliver.revision=${project.version}
-jdk.source=1.4
-jdk.target=1.4
+jdk.source=1.6
+jdk.target=1.6
commit ant-contrib for openSUSE:Factory
Hello community, here is the log from the commit of package ant-contrib for openSUSE:Factory checked in at 2017-05-31 13:28:43 Comparing /work/SRC/openSUSE:Factory/ant-contrib (Old) and /work/SRC/openSUSE:Factory/.ant-contrib.new (New) Package is "ant-contrib" Wed May 31 13:28:43 2017 rev:24 rq:496533 version:1.0b3 Changes: --- /work/SRC/openSUSE:Factory/ant-contrib/ant-contrib.changes 2015-04-02 15:51:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes 2017-05-31 13:28:46.112595000 +0200 @@ -1,0 +2,5 @@ +Fri May 19 09:08:21 UTC 2017 - tchva...@suse.com + +- Fix build with new javapackages-tools + +--- Other differences: -- ++ ant-contrib.spec ++ --- /var/tmp/diff_new_pack.VC7mFx/_old 2017-05-31 13:28:46.880486765 +0200 +++ /var/tmp/diff_new_pack.VC7mFx/_new 2017-05-31 13:28:46.884486201 +0200 @@ -1,7 +1,7 @@ # # spec file for package ant-contrib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,12 +32,13 @@ Patch1: ant-contrib-antservertest.patch Patch2: ant-contrib-pom.patch Patch3: ant-contrib-1.0b3-enable-for-task.patch -BuildRequires: ant >= 1.7.1 +BuildRequires: ant BuildRequires: apache-ivy BuildRequires: bcel >= 5.1 BuildRequires: commons-httpclient BuildRequires: commons-logging BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: xerces-j2
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2015-04-02 15:51:49
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 2015-03-18
13:01:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2015-04-02 15:51:49.0 +0200
@@ -1,0 +2,5 @@
+Wed Mar 18 09:42:22 UTC 2015 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+
+---
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.ghLRcl/_old 2015-04-02 15:51:50.0 +0200
+++ /var/tmp/diff_new_pack.ghLRcl/_new 2015-04-02 15:51:50.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ant-contrib
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -107,7 +107,7 @@
%config %{_sysconfdir}/ant.d/%{name}
%{_javadir}/ant/%{name}.jar
%{_mavenpomdir}/JPP.ant-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%{_datadir}/maven-metadata/%{name}.xml
%files manual
%defattr(-,root,root,-)
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2015-03-18 13:01:17
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 2014-07-16
16:49:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2015-03-18 13:01:18.0 +0100
@@ -1,0 +2,6 @@
+Thu Mar 12 22:39:50 UTC 2015 - arc...@dellroad.org
+
+- Add back patch enabling the task (boo#922324)
+ * ant-contrib-1.0b3-enable-for-task.patch
+
+---
New:
ant-contrib-1.0b3-enable-for-task.patch
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.dFIbui/_old 2015-03-18 13:01:19.0 +0100
+++ /var/tmp/diff_new_pack.dFIbui/_new 2015-03-18 13:01:19.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ant-contrib
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -31,6 +31,7 @@
Patch0: local-ivy.patch
Patch1: ant-contrib-antservertest.patch
Patch2: ant-contrib-pom.patch
+Patch3: ant-contrib-1.0b3-enable-for-task.patch
BuildRequires: ant >= 1.7.1
BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1
@@ -72,6 +73,7 @@
%patch0
%patch1
%patch2 -p1
+%patch3 -p1
find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
++ ant-contrib-1.0b3-enable-for-task.patch ++
diff -ur
ant-contrib-1.0b3.orig/src/java/net/sf/antcontrib/antcontrib.properties
ant-contrib-1.0b3/src/java/net/sf/antcontrib/antcontrib.properties
--- ant-contrib-1.0b3.orig/src/java/net/sf/antcontrib/antcontrib.properties
2006-10-28 06:57:56.0 -0500
+++ ant-contrib-1.0b3/src/java/net/sf/antcontrib/antcontrib.properties
2015-03-12 17:33:48.0 -0500
@@ -14,6 +14,7 @@
# Logic tasks
if=net.sf.antcontrib.logic.IfTask
+for=net.sf.antcontrib.logic.ForTask
foreach=net.sf.antcontrib.logic.ForEach
throw=net.sf.antcontrib.logic.Throw
trycatch=net.sf.antcontrib.logic.TryCatchTask
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2014-07-16 16:49:22
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 2013-12-06
14:38:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2014-07-16 16:49:30.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 7 09:25:13 UTC 2014 - tchva...@suse.com
+
+- Clean up a bit with spec-cleaner
+
+---
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.wNZbBo/_old 2014-07-16 16:49:31.0 +0200
+++ /var/tmp/diff_new_pack.wNZbBo/_new 2014-07-16 16:49:31.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ant-contrib
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -31,9 +31,7 @@
Patch0: local-ivy.patch
Patch1: ant-contrib-antservertest.patch
Patch2: ant-contrib-pom.patch
-
BuildRequires: ant >= 1.7.1
-%requires_eq ant
BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1
BuildRequires: commons-httpclient
@@ -42,11 +40,11 @@
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: xerces-j2
-
Requires: junit >= 3.8.1
Requires: xerces-j2
-BuildArch: noarch
+%requires_eqant
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
The Ant-Contrib project is a collection of tasks (and at one point
@@ -71,8 +69,8 @@
%setup -q -n %{name}
cp %{SOURCE1} %{name}-1.0b3.pom
cp %{SOURCE2} LICENSE-2.0.txt
-%patch0 -p0
-%patch1 -p0
+%patch0
+%patch1
%patch2 -p1
find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2013-12-06 13:44:42
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 2013-09-11
13:39:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2013-12-06 14:38:59.0 +0100
@@ -1,0 +2,27 @@
+Fri Nov 15 08:25:16 UTC 2013 - mvysko...@suse.com
+
+- don't require ant-junit for build, junit is sufficient
+ * reducing of cycles
+
+---
+Wed Nov 6 14:17:45 UTC 2013 - mvysko...@suse.com
+
+- upgrade to 1.0b3
+ * no upstream changelog available
+- removed patches:
+ * ant-contrib-1.0b2-enable-for-task.patch
+there is no for task in beta3
+ * ant-contrib-ant-1.7.0.patch
+no longer needed
+ * ant-contrib-build_xml.patch
+fixed upstream
+ * ant-contrib-BuildFileTest_java.patch
+no longer needed
+- added patches:
+ * ant-contrib-antservertest.patch
+ * ant-contrib-pom.patch
+ * local-ivy.patch
+- add pom file
+- add ant.d configuration
+
+---
Old:
BuildFileTest.java
ant-contrib-1.0b2-enable-for-task.patch
ant-contrib-1.0b2-src.tar.bz2
ant-contrib-BuildFileTest_java.patch
ant-contrib-ant-1.7.0.patch
ant-contrib-build_xml.patch
New:
LICENSE-2.0.txt
ant-contrib-1.0b3-src.tar.gz
ant-contrib-1.0b3.pom
ant-contrib-antservertest.patch
ant-contrib-pom.patch
local-ivy.patch
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.dsIOD7/_old 2013-12-06 14:39:00.0 +0100
+++ /var/tmp/diff_new_pack.dsIOD7/_new 2013-12-06 14:39:00.0 +0100
@@ -14,38 +14,37 @@
# 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
+Name: ant-contrib
+Version:1.0b3
+Release:0
Summary:Collection of tasks for Ant
License:Apache-2.0
Group: Development/Libraries/Java
-
-Name: ant-contrib
-Version:1.0b2
-Release:0
Url:http://ant-contrib.sourceforge.net/
-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
-Patch0: ant-contrib-build_xml.patch
-Patch1: ant-contrib-ant-1.7.0.patch
-Patch2: ant-contrib-BuildFileTest_java.patch
-#PATCH-FIX-OPENSUSE: bnc#644661
-Patch3: ant-contrib-1.0b2-enable-for-task.patch
-BuildRequires: ant >= %{ant_minimal_version}
+Source0:
http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
+Source1:
http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
+# ASL 2.0 Licence text
+# Upstream bug at
https://sourceforge.net/tracker/?func=detail&aid=3590371&group_id=36177&atid=416920
+Source2:http://www.apache.org/licenses/LICENSE-2.0.txt
+Patch0: local-ivy.patch
+Patch1: ant-contrib-antservertest.patch
+Patch2: ant-contrib-pom.patch
+
+BuildRequires: ant >= 1.7.1
+%requires_eq ant
+BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: commons-httpclient
+BuildRequires: commons-logging
+BuildRequires: java-devel
BuildRequires: javapackages-tools
-%if %{with_junit}
-BuildRequires: ant-junit >= %{ant_minimal_version}
+BuildRequires: junit
+BuildRequires: xerces-j2
+
Requires: junit >= 3.8.1
-%endif
-%requires_eq ant
-Requires: bcel >= 5.1
+Requires: xerces-j2
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -54,62 +53,69 @@
maybe types and other tools) for Apache Ant.
%packagemanual
-Summary:Collection of tasks for Ant
-Group: Development/Libraries/Java
+Summary:Manual for %{name}
+Group: Documentation/Other
%descriptionmanual
-The Ant-Contrib project is a collection of tasks (and at one point
-maybe types and other tools) for Apache Ant.
+Documentation for %{name} tasks.
+
+%packagejavadoc
+Summary:Javadoc for %{name}
+Group: Documentation/HTML
+Requires: jpackage-utils
+
+%descriptionjavadoc
+Api documentation for %{name}.
%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-c
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at 2013-09-11 13:39:37
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 2013-08-30
11:32:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2013-09-11 13:39:38.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 9 11:04:08 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.lMhMj2/_old 2013-09-11 13:39:39.0 +0200
+++ /var/tmp/diff_new_pack.lMhMj2/_new 2013-09-11 13:39:39.0 +0200
@@ -39,7 +39,7 @@
BuildRequires: ant >= %{ant_minimal_version}
BuildRequires: bcel >= 5.1
BuildRequires: java-1_5_0-gcj-compat-devel
-BuildRequires: jpackage-utils >= 1.6
+BuildRequires: javapackages-tools
%if %{with_junit}
BuildRequires: ant-junit >= %{ant_minimal_version}
Requires: junit >= 3.8.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ant-contrib for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.ant-contrib.new/ant-contrib.changes
2013-08-30 11:32:34.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.1KZd6h/_new 2013-08-30 11:32:36.0 +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.
-
-
-%packagejavadoc
-License:Apache-2.0
-Summary:Collection of tasks for Ant
-Group: Development/Libraries/Java
-Requires(post): /bin/rm,/bin/ln
-Requires(postun): /bin/rm
-
-%descriptionjavadoc
-The Ant-Contrib project is a collection of tasks (and at one point
-maybe types and other tools) for Apache Ant.
-
-
-
%packagemanual
-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
-# --
commit ant-contrib for openSUSE:Factory
Hello community, here is the log from the commit of package ant-contrib for openSUSE:Factory checked in at 2011-12-06 17:58:25 Comparing /work/SRC/openSUSE:Factory/ant-contrib (Old) and /work/SRC/openSUSE:Factory/.ant-contrib.new (New) Package is "ant-contrib", Maintainer is "bnc-team-j...@forge.provo.novell.com" Changes: Other differences: -- ++ ant-contrib.spec ++ --- /var/tmp/diff_new_pack.2wdLdV/_old 2011-12-06 17:58:49.0 +0100 +++ /var/tmp/diff_new_pack.2wdLdV/_new 2011-12-06 17:58:49.0 +0100 @@ -25,7 +25,7 @@ Name: ant-contrib Version:1.0b2 Release:47 -License:ASLv.. +License:Apache-2.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 @@ -56,7 +56,7 @@ %packagejavadoc -License:ASLv.. +License:Apache-2.0 Summary:Collection of tasks for Ant Group: Development/Libraries/Java Requires(post): /bin/rm,/bin/ln @@ -69,7 +69,7 @@ %packagemanual -License:ASLv.. +License:Apache-2.0 Summary:Collection of tasks for Ant Group: Development/Libraries/Java -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ant-contrib for openSUSE:Factory
Hello community,
here is the log from the commit of package ant-contrib for openSUSE:Factory
checked in at Fri Sep 23 10:18:59 CEST 2011.
--- ant-contrib/ant-contrib.changes 2010-10-08 11:41:15.0 +0200
+++ /mounts/work_src_done/STABLE/ant-contrib/ant-contrib.changes
2011-09-17 13:08:56.0 +0200
@@ -1,0 +2,5 @@
+Sat Sep 17 11:08:43 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+---
calling whatdependson for head-i586
Other differences:
--
++ ant-contrib.spec ++
--- /var/tmp/diff_new_pack.ESJVHN/_old 2011-09-23 10:18:53.0 +0200
+++ /var/tmp/diff_new_pack.ESJVHN/_new 2011-09-23 10:18:53.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ant-contrib (Version 1.0b2)
+# spec file for package ant-contrib
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
# icecream 0
%define with_junit 0
@@ -125,9 +124,6 @@
install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr %{name}/build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
