Attachment 1980161 Details for Bug 2217892 – The .spec file difference from Copr build 6118349 to 6214439

[patch] The .spec file difference from Copr build 6118349 to 6214439

spec-from-6118349-to-6214439.diff (text/plain), 1.99 KB, created by Fedora Review Service on 2023-07-26 15:38:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2023-07-26 15:38:04 UTC

Size: 1.99 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/6118349
>+++ https://copr.fedorainfracloud.org/coprs/build/6214439
>@@ -4,7 +4,9 @@
> Name:           ant-contrib
> Version:        1.0
> Release:        0.42.%{beta_number}%{?dist}
>-License:        ASL 2.0 and ASL 1.1
>+# Project site on sf lists both Apache Software License, Apache License V2.0
>+# see: https://sourceforge.net/projects/ant-contrib/
>+License:        Apache-2.0 AND Apache-1.1
> 
> URL:            http://ant-contrib.sourceforge.net/
> Source0:        https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
>@@ -39,20 +41,18 @@
> 
> %package        javadoc
> Summary:        Javadoc for %{name}
>-Requires:       jpackage-utils
> 
> %description    javadoc
> Api documentation for %{name}.
> 
> %prep
> %setup -q  -n %{name}
>-%patch2
>-%patch3 -p1
>-
>-cp %{SOURCE2} LICENSE-2.0.txt
>-
>-find -name '*.class' -exec rm -f '{}' \;
>-find -name '*.jar' -exec rm -f '{}' \;
>+%autopatch -p1
>+
>+cp -p %{SOURCE2} LICENSE-2.0.txt
>+
>+find -name '*.class' -delete
>+find -name '*.jar' -delete
> 
> sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
> # needs porting to latest ivy
>@@ -82,17 +82,18 @@
> 
> %files -f .mfiles
> %{_sysconfdir}/ant.d/ant-contrib
>-%doc target/docs/LICENSE.txt LICENSE-2.0.txt
>+%license target/docs/LICENSE.txt LICENSE-2.0.txt
> %doc target/docs/manual/tasks/*
> 
> %files javadoc -f .mfiles-javadoc
>-%doc target/docs/LICENSE.txt LICENSE-2.0.txt
>+%license target/docs/LICENSE.txt LICENSE-2.0.txt
> 
> %changelog
>-* Tue Jun 27 2023 Zdenek Zambersky <zzambers@redhat.com> - 1.0-0.42.b3
>+* Wed Jul 26 2023 Zdenek Zambersky <zzambers@redhat.com> - 1.0-0.42.b3
> - fixed build problems with goal to unretire package
>-- removed dependency on deprecaded/removed commons-httpclient
>+- removed dependency on deprecated/removed commons-httpclient
> - fixed ivy org/namespace
>+- fixes based on re-review
> 
> * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.41.b3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Actions: View | Diff

Attachments on bug 2217892: 1972827 | 1980161