The package rpms/git.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/git.git/commit/?id=6eb92cebdc7414....
Change:
-%ifarch %{ix86}
Thanks.
Full change:
============
commit 6eb92cebdc74144c933b26b1e35d4eb16f6dca44
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Mon Apr 16 11:47:00 2018 -0400
Re-enable t5000-tar-tree.sh test on f28
The unknown, but temporary, breakage in fedora-28-x86_64 buildroots
appears to be resolved.
The test was disabled in a998227 ("Disable t5000-tar-tree.sh on x86 in
f28", 2018-01-18).
diff --git a/git.spec b/git.spec
index f4866dd..c8cc645 100644
--- a/git.spec
+++ b/git.spec
@@ -83,7 +83,7 @@
Name: git
Version: 2.17.0
-Release: 2%{?rcrev}%{?dist}
+Release: 3%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -706,19 +706,6 @@ GIT_SKIP_TESTS=""
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25"
%endif
-%ifarch %{ix86}
-# Skip tests which fail on x86
-#
-# t5000-tar-tree fails on x86 in f28:
-# ++ git archive --remote=. --format=tar.gz HEAD
-# remote: fatal: Unknown archive format 'tar.gz'
-# fatal: The remote end hung up unexpectedly
-# There must be something broken or changed in f28 to cause this
-%if 0%{?fedora} && 0%{?fedora} == 28
-GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5000"
-%endif
-%endif
-
%ifarch %{power64}
# Skip tests which fail on ppc
#
@@ -899,8 +886,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
-* Mon Apr 16 2018 Todd Zullinger <tmz(a)pobox.com>
+* Mon Apr 16 2018 Todd Zullinger <tmz(a)pobox.com> 2.17.0-3
- Move linkcheck macro to existing fedora/rhel > 7 block
+- Re-enable t5000-tar-tree.sh test on f28
* Fri Apr 13 2018 Pavel Cahyna <pcahyna(a)redhat.com>
- Use BuildRequires: perl-interpreter per the packaging guidelines
commit da74a8e523528fa538c3d925c51fd22f711e0561
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Mon Apr 16 11:18:51 2018 -0400
Move linkcheck macro to existing fedora/rhel > 7 block
The spec file is a bit easier to read with as few conditional blocks as
required. Use %bcond_(with|without) to allow easier toggling of the
link checking.
diff --git a/git.spec b/git.spec
index 498d683..f4866dd 100644
--- a/git.spec
+++ b/git.spec
@@ -20,10 +20,13 @@
# Settings for Fedora and EL > 7
%if 0%{?fedora} || 0%{?rhel} > 7
%bcond_without python3
+# linkchcker is not available on EL <= 7
+%bcond_without linkcheck
%global use_perl_generators 1
%global use_perl_interpreter 1
%else
%bcond_with python3
+%bcond_with linkcheck
%global use_perl_generators 0
%global use_perl_interpreter 0
%endif
@@ -75,13 +78,6 @@
%global __global_ldflags -Wl,-z,relro -Wl,-z,now
%endif
-# Test links in HTML documentation on Fedora (linkchecker is not in EL <= 7)
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global test_links 1
-%else
-%global test_links 0
-%endif
-
# Define for release candidates
#global rcrev .rc0
@@ -128,7 +124,7 @@ Patch3:
0001-daemon.c-fix-condition-for-redirecting-stderr.patch
%if %{with docs}
BuildRequires: asciidoc >= 8.4.1
BuildRequires: xmlto
-%if %{test_links}
+%if %{with linkcheck}
BuildRequires: linkchecker
%endif
%endif
@@ -692,7 +688,8 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \
##### #DOC
%check
-%if %{with docs} && %{test_links}
+%if %{with docs} && %{with linkcheck}
+# Test links in HTML documentation
find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker
%endif
@@ -902,6 +899,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Mon Apr 16 2018 Todd Zullinger <tmz(a)pobox.com>
+- Move linkcheck macro to existing fedora/rhel > 7 block
+
* Fri Apr 13 2018 Pavel Cahyna <pcahyna(a)redhat.com>
- Use BuildRequires: perl-interpreter per the packaging guidelines
- Update conditions for future RHEL
commit 34c24408842e5b5dd7cd43926e45f8b2b31962ca
Author: Pavel Cahyna <pcahyna(a)redhat.com>
Date: Fri Apr 13 17:30:53 2018 +0200
Update conditions for future RHEL
diff --git a/git.spec b/git.spec
index 6e24092..498d683 100644
--- a/git.spec
+++ b/git.spec
@@ -75,8 +75,8 @@
%global __global_ldflags -Wl,-z,relro -Wl,-z,now
%endif
-# Test links in HTML documentation on Fedora (linkchecker is not in EL)
-%if 0%{?fedora}
+# Test links in HTML documentation on Fedora (linkchecker is not in EL <= 7)
+%if 0%{?fedora} || 0%{?rhel} > 7
%global test_links 1
%else
%global test_links 0
@@ -181,7 +181,7 @@ BuildRequires: cvs
BuildRequires: cvsps
%endif
BuildRequires: gnupg
-%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} == 7 &&
%{_arch} != ppc64 ))
+%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7
&& %{_arch} != ppc64 ))
BuildRequires: highlight
%endif
BuildRequires: httpd
@@ -904,6 +904,7 @@ make test || ./print-failed-test-output
%changelog
* Fri Apr 13 2018 Pavel Cahyna <pcahyna(a)redhat.com>
- Use BuildRequires: perl-interpreter per the packaging guidelines
+- Update conditions for future RHEL
* Tue Apr 10 2018 Todd Zullinger <tmz(a)pobox.com> - 2.17.0-2
- Require perl-generators on EL > 7
commit 1a82d92cd438a697f781ab13b988ed29a9708610
Author: Pavel Cahyna <pcahyna(a)redhat.com>
Date: Fri Apr 13 17:24:20 2018 +0200
Conform to the Packaging Guidelines for Perl
Add BuildRequires: perl-interpreter (or perl on systems that do not
provide perl-interpreter) since perl is invoked during the build
process.
(
https://fedoraproject.org/wiki/Packaging:Perl#Build_Dependencies,
https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules)
Probably no functional change, since perl is being brought in via other
deps.
diff --git a/git.spec b/git.spec
index 9477fc1..6e24092 100644
--- a/git.spec
+++ b/git.spec
@@ -21,9 +21,11 @@
%if 0%{?fedora} || 0%{?rhel} > 7
%bcond_without python3
%global use_perl_generators 1
+%global use_perl_interpreter 1
%else
%bcond_with python3
%global use_perl_generators 0
+%global use_perl_interpreter 0
%endif
# Settings for Fedora and EL >= 7
@@ -150,6 +152,11 @@ BuildRequires: perl(Test)
%if %{use_perl_generators}
BuildRequires: perl-generators
%endif
+%if %{use_perl_interpreter}
+BuildRequires: perl-interpreter
+%else
+BuildRequires: perl
+%endif
%if %{bashcomp_pkgconfig}
BuildRequires: pkgconfig(bash-completion)
%endif
@@ -895,6 +902,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Fri Apr 13 2018 Pavel Cahyna <pcahyna(a)redhat.com>
+- Use BuildRequires: perl-interpreter per the packaging guidelines
+
* Tue Apr 10 2018 Todd Zullinger <tmz(a)pobox.com> - 2.17.0-2
- Require perl-generators on EL > 7