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=33ecb7860bb291....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 16e19ee3561f67a2186abbcd066b0a940fdc0875
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Thu Oct 24 12:59:13 2019 -0400
gitk: add Requires: git-gui (#1765113)
While this could arguably be a Recommends: rather than Requires:, we
chose the latter for a few reasons. The user experience when running
gitk and selecting "Start git gui" from the menu is quite poor. No
indication is shown to the user graphically. The only hint as to why
git gui did not start is output to stdout (and is not terribly helpful
for users who may be using gitk and git-gui because they are unfamiliar
with the command-line).
There are no additional dependencies pulled in by git-gui which are not
already dependencies of gitk. And the git-gui package is relatively
small.
Lastly, the default behavior of Recommends: is the same as Requires: at
this time.
If/when any of these things change, we may revisit whether moving to
Recommends: makes more sense.
Thanks to Vasiliy Glazov and Pavel Cahyna for reporting the issue and
helping to determine the proper resolution.
diff --git a/git.spec b/git.spec
index 5be40ef..ee18dce 100644
--- a/git.spec
+++ b/git.spec
@@ -391,6 +391,7 @@ Provides: emacs-git-el = %{version}-%{release}
Summary: Git repository browser
BuildArch: noarch
Requires: git = %{version}-%{release}
+Requires: git-gui = %{version}-%{release}
Requires: tk >= 8.4
%description -n gitk
%{summary}.
@@ -1026,6 +1027,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
* Thu Oct 24 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.1.rc1
- update to 2.24.0-rc1
- skip failing test in t7812-grep-icase-non-ascii on s390x
+- gitk: add Requires: git-gui (#1765113)
* Sat Oct 19 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.0.rc0
- update to 2.24.0-rc0
commit 33ecb7860bb29161df134313f0099bb7768c0cf3
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Thu Oct 24 14:50:44 2019 -0400
skip failing test in t7812-grep-icase-non-ascii on s390x
The "PCRE v2: grep non-ASCII from invalid UTF-8 data" test fails on
big-endian arches. This is known upstream and will hopefully be
resolved soon.
Reference:
https://public-inbox.org/git/20191020002648.GZ10893@pobox.com/
diff --git a/git.spec b/git.spec
index 5ebe9cd..5be40ef 100644
--- a/git.spec
+++ b/git.spec
@@ -828,6 +828,16 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115"
%endif
# endif %%{power64}
+%ifarch s390x
+# Skip tests which fail on s390x
+#
+# t7812-grep-icase-non-ascii's "PCRE v2: grep non-ASCII from invalid UTF-8
+# data" test fails on big-endian arches. This is known upstream and will
+# hopefully be resolved soon (2019/10/24, tmz)
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t7812.11"
+%endif
+# endif s390x
+
export GIT_SKIP_TESTS
# Set LANG so various UTF-8 tests are run
@@ -1015,6 +1025,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%changelog
* Thu Oct 24 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.1.rc1
- update to 2.24.0-rc1
+- skip failing test in t7812-grep-icase-non-ascii on s390x
* Sat Oct 19 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.0.rc0
- update to 2.24.0-rc0
commit 8b2d34ca4f6955287a829206db85f2a55ae3c5f0
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Thu Oct 24 12:58:28 2019 -0400
update to 2.24.0-rc1
Adjust skipped test number in t5541-http-push-smart.sh (skipped on
aarch64, %{arm}, and %{power64}). A new test was added in upstream
6f1194246a ("remote-curl: pass on atomic capability to remote side",
2019-10-16), resulting in the "push 2000 tags over http" test number
changing.
Release notes:
https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.24.0.txt
diff --git a/0001-test-progress-fix-test-failures-on-big-endian-system.patch
b/0001-test-progress-fix-test-failures-on-big-endian-system.patch
deleted file mode 100644
index ba00b70..0000000
--- a/0001-test-progress-fix-test-failures-on-big-endian-system.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1ac77295ff34b80bd8c17887f9a84b8557a9c0cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= <szeder.dev(a)gmail.com>
-Date: Sun, 20 Oct 2019 01:37:06 +0200
-Subject: [PATCH] test-progress: fix test failures on big-endian systems
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In 't0500-progress-display.sh' all tests running 'test-tool progress
---total=<N>' fail on big-endian systems, e.g. like this:
-
- |+ test-tool progress --total=3 Working hard
- |[...]
- |+ test_i18ncmp expect out
- |--- expect 2019-10-18 23:07:54.765523916 +0000
- |+++ out 2019-10-18 23:07:54.773523916 +0000
- |@@ -1,4 +1,2 @@
- |-Working hard: 33% (1/3)<CR>
- |-Working hard: 66% (2/3)<CR>
- |-Working hard: 100% (3/3)<CR>
- |-Working hard: 100% (3/3), done.
- |+Working hard: 0% (1/12884901888)<CR>
- |+Working hard: 0% (3/12884901888), done.
-
-The reason for that bogus value is that '--total's parameter is parsed
-via parse-options's OPT_INTEGER into a uint64_t variable [1], so the
-two bits of 3 end up in the "wrong" bytes on big-endian systems
-(12884901888 = 0x300000000).
-
-Change the type of that variable from uint64_t to int, to match what
-parse-options expects; in the tests of the progress output we won't
-use values that don't fit into an int anyway.
-
-[1] start_progress() expects the total number as an uint64_t, that's
- why I chose the same type when declaring the variable holding the
- value given on the command line.
-
-Signed-off-by: SZEDER Gbor <szeder.dev(a)gmail.com>
----
- t/helper/test-progress.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c
-index 4e9f7fafdf..42b96cb103 100644
---- a/t/helper/test-progress.c
-+++ b/t/helper/test-progress.c
-@@ -29,7 +29,7 @@ void progress_test_force_update(void);
-
- int cmd__progress(int argc, const char **argv)
- {
-- uint64_t total = 0;
-+ int total = 0;
- const char *title;
- struct strbuf line = STRBUF_INIT;
- struct progress *progress;
diff --git a/git.spec b/git.spec
index 29d50c4..5ebe9cd 100644
--- a/git.spec
+++ b/git.spec
@@ -84,11 +84,11 @@
%endif
# Define for release candidates
-%global rcrev .rc0
+%global rcrev .rc1
Name: git
Version: 2.24.0
-Release: 0.0%{?rcrev}%{?dist}
+Release: 0.1%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -120,9 +120,6 @@ Source99: print-failed-test-output
#
https://bugzilla.redhat.com/490602
Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
-#
https://public-inbox.org/git/20191019233706.GM29845@szeder.dev/
-Patch1: 0001-test-progress-fix-test-failures-on-big-endian-system.patch
-
%if %{with docs}
# pod2man is needed to build Git.3pm
BuildRequires: %{_bindir}/pod2man
@@ -814,9 +811,9 @@ GIT_SKIP_TESTS=""
#
# The following 2 tests use run_with_limited_cmdline, which calls ulimit -s 128
# to limit the maximum stack size.
-# t5541.34 'push 2000 tags over http'
+# t5541.35 'push 2000 tags over http'
# t5551.25 'clone the 2,000 tag repo to check OS command line overflow'
-GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.34 t5551.25"
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.35 t5551.25"
%endif
# endif aarch64 %%{arm} %%{power64}
@@ -1016,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Thu Oct 24 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.1.rc1
+- update to 2.24.0-rc1
+
* Sat Oct 19 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.0.rc0
- update to 2.24.0-rc0
- fix t0500-progress-display on big-endian arches
diff --git a/sources b/sources
index 9adf696..c1a3bbf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.24.0.rc0.tar.xz) =
94aa91496bd34f691a1de2bb9610a77b949b26a73cad3dab84f15461c6b3ffa1f6a272f6ea2248b7cf50797e7ccc27ca3cd033980f37b95bf9339a33ffb358f8
-SHA512 (git-2.24.0.rc0.tar.sign) =
b322c9a22a99e6bf8b13cfa17dcc3f6c7260fbdd0b515bca850cb8b3a1419da35f3beb73638ad7d148234cf875398e374605ad4840df416bcbcc220edfb007fe
+SHA512 (git-2.24.0.rc1.tar.xz) =
02a52e3e2dafde7966e0f3a81c43702b87265f990b829012317ba03ef70bdd56b1ca715e002d89eb7a3c44d04ebecb587e13808b8a6882a4b2650e86ae82fa7a
+SHA512 (git-2.24.0.rc1.tar.sign) =
6d851e10c5866b456e3ec81cf57a4e517ab53a5ff48cf22fbd4ce45b3408312fd3b991fd58dee6202daa44a0d1b5a39be10862c2bdc6a2632c59c5e0d626c9fb
commit 61b7079c2f92b5909010f3a5b94354e88045db32
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Sat Oct 19 19:57:53 2019 -0400
fix t0500-progress-display on big-endian arches
Thanks to SZEDER Gbor <szeder.dev(a)gmail.com> for a quick patch.
diff --git a/0001-test-progress-fix-test-failures-on-big-endian-system.patch
b/0001-test-progress-fix-test-failures-on-big-endian-system.patch
new file mode 100644
index 0000000..ba00b70
--- /dev/null
+++ b/0001-test-progress-fix-test-failures-on-big-endian-system.patch
@@ -0,0 +1,55 @@
+From 1ac77295ff34b80bd8c17887f9a84b8557a9c0cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= <szeder.dev(a)gmail.com>
+Date: Sun, 20 Oct 2019 01:37:06 +0200
+Subject: [PATCH] test-progress: fix test failures on big-endian systems
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In 't0500-progress-display.sh' all tests running 'test-tool progress
+--total=<N>' fail on big-endian systems, e.g. like this:
+
+ |+ test-tool progress --total=3 Working hard
+ |[...]
+ |+ test_i18ncmp expect out
+ |--- expect 2019-10-18 23:07:54.765523916 +0000
+ |+++ out 2019-10-18 23:07:54.773523916 +0000
+ |@@ -1,4 +1,2 @@
+ |-Working hard: 33% (1/3)<CR>
+ |-Working hard: 66% (2/3)<CR>
+ |-Working hard: 100% (3/3)<CR>
+ |-Working hard: 100% (3/3), done.
+ |+Working hard: 0% (1/12884901888)<CR>
+ |+Working hard: 0% (3/12884901888), done.
+
+The reason for that bogus value is that '--total's parameter is parsed
+via parse-options's OPT_INTEGER into a uint64_t variable [1], so the
+two bits of 3 end up in the "wrong" bytes on big-endian systems
+(12884901888 = 0x300000000).
+
+Change the type of that variable from uint64_t to int, to match what
+parse-options expects; in the tests of the progress output we won't
+use values that don't fit into an int anyway.
+
+[1] start_progress() expects the total number as an uint64_t, that's
+ why I chose the same type when declaring the variable holding the
+ value given on the command line.
+
+Signed-off-by: SZEDER Gbor <szeder.dev(a)gmail.com>
+---
+ t/helper/test-progress.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c
+index 4e9f7fafdf..42b96cb103 100644
+--- a/t/helper/test-progress.c
++++ b/t/helper/test-progress.c
+@@ -29,7 +29,7 @@ void progress_test_force_update(void);
+
+ int cmd__progress(int argc, const char **argv)
+ {
+- uint64_t total = 0;
++ int total = 0;
+ const char *title;
+ struct strbuf line = STRBUF_INIT;
+ struct progress *progress;
diff --git a/git.spec b/git.spec
index f65d331..29d50c4 100644
--- a/git.spec
+++ b/git.spec
@@ -120,6 +120,9 @@ Source99: print-failed-test-output
#
https://bugzilla.redhat.com/490602
Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
+#
https://public-inbox.org/git/20191019233706.GM29845@szeder.dev/
+Patch1: 0001-test-progress-fix-test-failures-on-big-endian-system.patch
+
%if %{with docs}
# pod2man is needed to build Git.3pm
BuildRequires: %{_bindir}/pod2man
@@ -1015,6 +1018,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%changelog
* Sat Oct 19 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.0.rc0
- update to 2.24.0-rc0
+- fix t0500-progress-display on big-endian arches
* Fri Aug 16 2019 Todd Zullinger <tmz(a)pobox.com> - 2.23.0-1
- Update to 2.23.0
commit 8040cda9193bbf008005dfd75828a61356ef7b44
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Fri Oct 18 23:14:21 2019 -0400
update to 2.24.0-rc0
https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.24.0.txt
diff --git a/git.spec b/git.spec
index 6e19374..f65d331 100644
--- a/git.spec
+++ b/git.spec
@@ -84,11 +84,11 @@
%endif
# Define for release candidates
-#global rcrev .rc0
+%global rcrev .rc0
Name: git
-Version: 2.23.0
-Release: 1%{?rcrev}%{?dist}
+Version: 2.24.0
+Release: 0.0%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1013,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Sat Oct 19 2019 Todd Zullinger <tmz(a)pobox.com> - 2.24.0-0.0.rc0
+- update to 2.24.0-rc0
+
* Fri Aug 16 2019 Todd Zullinger <tmz(a)pobox.com> - 2.23.0-1
- Update to 2.23.0
diff --git a/sources b/sources
index 4beda38..9adf696 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.23.0.tar.xz) =
c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
-SHA512 (git-2.23.0.tar.sign) =
7fbae475901966604f9d6a5a1a62cb01d7fcb696bf742f3bd9fff3ac667233744ee42f9df5fbca3ee4106282384dea16aab86430ae30fceed8959b7700a27614
+SHA512 (git-2.24.0.rc0.tar.xz) =
94aa91496bd34f691a1de2bb9610a77b949b26a73cad3dab84f15461c6b3ffa1f6a272f6ea2248b7cf50797e7ccc27ca3cd033980f37b95bf9339a33ffb358f8
+SHA512 (git-2.24.0.rc0.tar.sign) =
b322c9a22a99e6bf8b13cfa17dcc3f6c7260fbdd0b515bca850cb8b3a1419da35f3beb73638ad7d148234cf875398e374605ad4840df416bcbcc220edfb007fe