Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ant-contrib for openSUSE:Factory checked in at 2023-10-19 22:47:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant-contrib (Old) and /work/SRC/openSUSE:Factory/.ant-contrib.new.1945 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant-contrib" Thu Oct 19 22:47:00 2023 rev:28 rq:1118286 version:1.0b3 Changes: -------- --- /work/SRC/openSUSE:Factory/ant-contrib/ant-contrib.changes 2022-11-15 13:21:00.080669388 +0100 +++ /work/SRC/openSUSE:Factory/.ant-contrib.new.1945/ant-contrib.changes 2023-10-19 22:49:21.510869368 +0200 @@ -1,0 +2,8 @@ +Tue Oct 17 11:05:25 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Clean the spec file a bit +- Removed patch: + * ant-contrib-pom.patch + + not needed any more with the javapackages-tools >= 6 + +------------------------------------------------------------------- Old: ---- ant-contrib-pom.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-contrib.spec ++++++ --- /var/tmp/diff_new_pack.VnQfga/_old 2023-10-19 22:49:22.026888084 +0200 +++ /var/tmp/diff_new_pack.VnQfga/_new 2023-10-19 22:49:22.026888084 +0200 @@ -1,7 +1,7 @@ # # spec file for package ant-contrib # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,17 +22,16 @@ Summary: Collection of tasks for Ant License: Apache-2.0 Group: Development/Libraries/Java -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 +URL: https://ant-contrib.sourceforge.net/ +Source0: https://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz +Source1: https://repo1.maven.org/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 -Patch3: ant-contrib-1.0b3-enable-for-task.patch -Patch4: ant-contrib-sourcetarget.patch +Patch2: ant-contrib-1.0b3-enable-for-task.patch +Patch3: ant-contrib-sourcetarget.patch BuildRequires: ant BuildRequires: apache-ivy BuildRequires: bcel >= 5.1 @@ -40,8 +39,7 @@ BuildRequires: commons-logging BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local -BuildRequires: javapackages-tools +BuildRequires: javapackages-local >= 6 BuildRequires: junit BuildRequires: xerces-j2 Requires: junit >= 3.8.1 @@ -70,13 +68,14 @@ %prep %setup -q -n %{name} -cp %{SOURCE1} %{name}-1.0b3.pom +cp %{SOURCE1} %{name}-%{version}.pom cp %{SOURCE2} LICENSE-2.0.txt %patch0 %patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 + +%pom_change_dep ant: org.apache.ant %{name}-%{version}.pom find . -name '*.jar' -or -name '*.class' -exec rm -rf {} + @@ -85,7 +84,7 @@ rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java %build -ant dist +%{ant} dist %install # jars @@ -100,19 +99,13 @@ echo "ant/ant-contrib" > %{buildroot}%{_sysconfdir}/ant.d/ant-contrib install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom - -echo "call add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar" +%{mvn_install_pom} %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom %add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar -%files +%files -f .mfiles %defattr(0644,root,root,0755) -%license target/docs/LICENSE.txt -%doc LICENSE-2.0.txt +%license target/docs/LICENSE.txt 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 %doc target/docs/manual/tasks/*
