From baace326001671d887b5091d242471c7c02ec094 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:39:53 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 77be08bd03dcffc771883b45073d84bf1d566eb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:55:08 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7bfd104beb4808898276e173943088d359e5f6f7 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Wed, 1 May 2024 19:44:24 +0200 Subject: [PATCH 03/13] New upstream release 2.24 --- .gitignore | 1 + fossil.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 621d14f..5cdc34c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /fossil-src-2.19.tar.gz /fossil-src-2.20.tar.gz /fossil-src-2.23.tar.gz +/fossil-src-2.24.tar.gz diff --git a/fossil.spec b/fossil.spec index bdde75c..d021e4a 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.23 +Version: 2.24 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki diff --git a/sources b/sources index 3e279c7..05fe06c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.23.tar.gz) = bba67e16b26b97aa40023a4a2aa3b2abfc9393ec8d3244ec88dab5b7d2c4d46e7d6ee89b008a6bce1f18c96c351c8d41d64f02ba28c0eb3eb04d01e308f3335b +SHA512 (fossil-src-2.24.tar.gz) = 7fc7de7d947b0946866df38c6cb2215f6452d31903cae6470bb4a692816b2803eb66ea372280256e5cd00759e4d02a0ae459de2f56f39af10e873579d53d33ee From b60c0244d538fb21f42efcbf81f9b20b9659a45e Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Sun, 28 Apr 2024 17:25:12 -0700 Subject: [PATCH 04/13] Update fossil to upstream version 2.24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Turn off tests during build. New failed tests are not solved by upstream yet: amend-tag-1.1 amend-tag-2.1 settings-valid-local-default-skin settings-valid-global-default-skin stash-1-show - Apache change work-around for security fix - Skin enhancements - Enhancements to the /timeline page - The /uvlist page now shows the hash algorithm - Markdown formatter: improved handling of indented fenced code blocks that contain blank lines - Import the latest Pikchr containing support for "diamond" objects. - Add ability to render committed Pikchr files to SVG via /doc/…/foo.pikchr?popup URLs. - Update Fossil's internal robot detection logic so that it correctly identifies the new GoogleOther crawler as a robot. --- fossil.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index d021e4a..c0c1bfe 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,4 +1,4 @@ -%bcond_without tests +%bcond_with tests Name: fossil Version: 2.24 Release: %autorelease From 7be950639a08685882d1078322c96f4d661f25f7 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 4 May 2024 15:10:38 +0200 Subject: [PATCH 05/13] Fix tests --- disable-broken-tests.patch | 121 +++++++++++++++++++ fix-or-disable-broken-tests.patch | 189 ++++++++++++++++++++++++++++++ fossil.spec | 6 +- 3 files changed, 314 insertions(+), 2 deletions(-) create mode 100644 disable-broken-tests.patch create mode 100644 fix-or-disable-broken-tests.patch diff --git a/disable-broken-tests.patch b/disable-broken-tests.patch new file mode 100644 index 0000000..8015704 --- /dev/null +++ b/disable-broken-tests.patch @@ -0,0 +1,121 @@ +https://fossil-scm.org/home/info/fb4e90b662803e47 + +Index: test/utf.test +================================================================== +--- test/utf.test ++++ test/utf.test +@@ -17609,25 +17609,25 @@ + Has flag LOOK_LONG: no + Has flag LOOK_INVALID: no + Has flag LOOK_ODD: no + Has flag LOOK_SHORT: no} + +-utf-check 1179 utf-check-1179-2-129-1.jnk \ +-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. +-Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: yes +-Looks like UTF-8: yes +-Has flag LOOK_NUL: no +-Has flag LOOK_CR: no +-Has flag LOOK_LONE_CR: no +-Has flag LOOK_LF: no +-Has flag LOOK_LONE_LF: no +-Has flag LOOK_CRLF: no +-Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: yes +-Has flag LOOK_ODD: no +-Has flag LOOK_SHORT: no} ++#utf-check 1179 utf-check-1179-2-129-1.jnk \ ++#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. ++#Starts with UTF-8 BOM: no ++#Starts with UTF-16 BOM: yes ++#Looks like UTF-8: yes ++#Has flag LOOK_NUL: no ++#Has flag LOOK_CR: no ++#Has flag LOOK_LONE_CR: no ++#Has flag LOOK_LF: no ++#Has flag LOOK_LONE_LF: no ++#Has flag LOOK_CRLF: no ++#Has flag LOOK_LONG: no ++#Has flag LOOK_INVALID: yes ++#Has flag LOOK_ODD: no ++#Has flag LOOK_SHORT: no} + + utf-check 1180 utf-check-1180-2-130-0.jnk \ + {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes. + Starts with UTF-8 BOM: no + Starts with UTF-16 BOM: yes +@@ -24121,41 +24121,41 @@ + Has flag LOOK_LONG: no + Has flag LOOK_INVALID: yes + Has flag LOOK_ODD: no + Has flag LOOK_SHORT: no} + +-utf-check 1586 utf-check-1586-3-128-0.jnk \ +-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. +-Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: reversed +-Looks like UTF-16: no +-Has flag LOOK_NUL: yes +-Has flag LOOK_CR: no +-Has flag LOOK_LONE_CR: no +-Has flag LOOK_LF: no +-Has flag LOOK_LONE_LF: no +-Has flag LOOK_CRLF: no +-Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: no +-Has flag LOOK_ODD: no +-Has flag LOOK_SHORT: no} +- +-utf-check 1587 utf-check-1587-3-128-1.jnk \ +-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. +-Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: reversed +-Looks like UTF-8: no +-Has flag LOOK_NUL: yes +-Has flag LOOK_CR: no +-Has flag LOOK_LONE_CR: no +-Has flag LOOK_LF: no +-Has flag LOOK_LONE_LF: no +-Has flag LOOK_CRLF: no +-Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: yes +-Has flag LOOK_ODD: no +-Has flag LOOK_SHORT: no} ++#utf-check 1586 utf-check-1586-3-128-0.jnk \ ++#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. ++#Starts with UTF-8 BOM: no ++#Starts with UTF-16 BOM: reversed ++#Looks like UTF-16: no ++#Has flag LOOK_NUL: yes ++#Has flag LOOK_CR: no ++#Has flag LOOK_LONE_CR: no ++#Has flag LOOK_LF: no ++#Has flag LOOK_LONE_LF: no ++#Has flag LOOK_CRLF: no ++#Has flag LOOK_LONG: no ++#Has flag LOOK_INVALID: no ++#Has flag LOOK_ODD: no ++#Has flag LOOK_SHORT: no} ++ ++#utf-check 1587 utf-check-1587-3-128-1.jnk \ ++#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. ++#Starts with UTF-8 BOM: no ++#Starts with UTF-16 BOM: reversed ++#Looks like UTF-8: no ++#Has flag LOOK_NUL: yes ++#Has flag LOOK_CR: no ++#Has flag LOOK_LONE_CR: no ++#Has flag LOOK_LF: no ++#Has flag LOOK_LONE_LF: no ++#Has flag LOOK_CRLF: no ++#Has flag LOOK_LONG: no ++#Has flag LOOK_INVALID: yes ++#Has flag LOOK_ODD: no ++#Has flag LOOK_SHORT: no} + + utf-check 1588 utf-check-1588-3-129-0.jnk \ + {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes. + Starts with UTF-8 BOM: no + Starts with UTF-16 BOM: no + diff --git a/fix-or-disable-broken-tests.patch b/fix-or-disable-broken-tests.patch new file mode 100644 index 0000000..8ff9790 --- /dev/null +++ b/fix-or-disable-broken-tests.patch @@ -0,0 +1,189 @@ +https://fossil-scm.org/home/info/5ad708085a90365f + +Index: test/amend.test +================================================================== +--- test/amend.test ++++ test/amend.test +@@ -313,10 +313,11 @@ + } + foreach res [lsort -nocase $result] { + append t2exp "sym-$res*" + } + eval fossil amend $HASH $tags ++ set t1exp [string trimleft $t1exp ,] + test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]} + fossil tag ls --raw $HASH + test amend-tag-$tc.2 {[string match $t2exp $RESULT]} + fossil timeline -n 1 + test amend-tag-$tc.3 {[string match $t3exp $RESULT]} + +Index: test/merge5.test +================================================================== +--- test/merge5.test ++++ test/merge5.test +@@ -23,11 +23,11 @@ + } + protOut { + fossil sqlite3 --no-repository reacts badly to SQL dumped from + repositories created from fossil older than version 2.0. + } +-test merge5-sqlite3-issue false knownBug ++#test merge5-sqlite3-issue false knownBug + test_cleanup_then_return + + # Verify the results of a check-out + # + proc checkout-test {testid expected_content} { + +Index: test/stash.test +================================================================== +--- test/stash.test ++++ test/stash.test +@@ -168,14 +168,14 @@ + + ######## + # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS? + # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS? + +-fossil stash show +-test stash-1-show {[normalize_result] eq $diff_stash_1} +-fossil stash diff +-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug ++#fossil stash show ++#test stash-1-show {[normalize_result] eq $diff_stash_1} ++#fossil stash diff ++#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug + + ######## + # fossil stash pop + + stash-test 2 pop { +@@ -206,16 +206,16 @@ + # fossil: ./src/delta.c:231: checksum: Assertion '...' failed. + # Should be triggered by this stash-WY-1 test. + fossil checkout --force c1 + fossil clean + fossil mv --soft f1 f1new +-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { +- REVERT f1 +- DELETE f1new +-} -changes { +-} -addremove { +-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} ++#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { ++# REVERT f1 ++# DELETE f1new ++#} -changes { ++#} -addremove { ++#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} + # TODO: add tests that verify the saved stash is sensible. Possibly + # by applying it and checking results. But until the SQLITE_CONSTRAINT + # error is fixed, there is nothing stashed to test. + + +@@ -296,16 +296,17 @@ + }] -changes { + RENAMED f2 -> f2n + } -addremove { + } -exists {f1 f2n} -notexists {f2} + +-stash-test 3-2 {save -m f2n} { +- REVERT f2 +- DELETE f2n +-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} ++fossil stash save -m f2n ++#stash-test 3-2 {save -m f2n} { ++# REVERT f2 ++# DELETE f2n ++#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} + fossil stash show +-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug ++#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug + test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} + stash-test 3-2-pop {pop} { + UPDATE f1 + UPDATE f2n + } -changes { + +Index: test/tester.tcl +================================================================== +--- test/tester.tcl ++++ test/tester.tcl +@@ -308,10 +308,11 @@ + comment-format \ + crlf-glob \ + crnl-glob \ + default-csp \ + default-perms \ ++ default-skin \ + diff-binary \ + diff-command \ + dont-commit \ + dont-push \ + dotfiles \ + +Index: test/utf.test +================================================================== +--- test/utf.test ++++ test/utf.test +@@ -35,11 +35,11 @@ + set i 1 + foreach {fileName result} $args { + set fileName [file join $tempPath $fileName] + fossil test-looks-like-utf $fileName + set result [string map [list %TEMP% $tempPath \r\n \n] $result] +- # if {$::RESULT ne $result} {puts stdout $::RESULT} ++ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit} + test utf-check-$testname.$i {$::RESULT eq $result} + incr i + } + } + +@@ -17613,12 +17613,12 @@ + + utf-check 1179 utf-check-1179-2-129-1.jnk \ + {File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. + Starts with UTF-8 BOM: no + Starts with UTF-16 BOM: yes +-Looks like UTF-8: no +-Has flag LOOK_NUL: yes ++Looks like UTF-8: yes ++Has flag LOOK_NUL: no + Has flag LOOK_CR: no + Has flag LOOK_LONE_CR: no + Has flag LOOK_LF: no + Has flag LOOK_LONE_LF: no + Has flag LOOK_CRLF: no +@@ -24124,27 +24124,27 @@ + Has flag LOOK_SHORT: no} + + utf-check 1586 utf-check-1586-3-128-0.jnk \ + {File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. + Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: no +-Looks like UTF-8: no ++Starts with UTF-16 BOM: reversed ++Looks like UTF-16: no + Has flag LOOK_NUL: yes + Has flag LOOK_CR: no + Has flag LOOK_LONE_CR: no + Has flag LOOK_LF: no + Has flag LOOK_LONE_LF: no + Has flag LOOK_CRLF: no + Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: yes ++Has flag LOOK_INVALID: no + Has flag LOOK_ODD: no + Has flag LOOK_SHORT: no} + + utf-check 1587 utf-check-1587-3-128-1.jnk \ + {File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. + Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: no ++Starts with UTF-16 BOM: reversed + Looks like UTF-8: no + Has flag LOOK_NUL: yes + Has flag LOOK_CR: no + Has flag LOOK_LONE_CR: no + Has flag LOOK_LF: no + diff --git a/fossil.spec b/fossil.spec index c0c1bfe..173859f 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,4 +1,4 @@ -%bcond_with tests +%bcond_without tests Name: fossil Version: 2.24 Release: %autorelease @@ -10,6 +10,8 @@ Source0: %{URL}home/tarball/version-%{version}/fossil-src-%{version}.ta Source1: template.config Source2: fossil-doc Source3: fossil-doc-README +Patch0: fix-or-disable-broken-tests.patch +Patch1: disable-broken-tests.patch BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -34,7 +36,7 @@ Documentation in repository format for %{name}. Users can run `fossil ui` in %{_docdir}/%{name}-doc folder to view documents in browser. %prep -%autosetup -n fossil-src-%{version} +%autosetup -p0 -n fossil-src-%{version} # Update config.guess/sub to fix builds on new architectures (aarch64/ppc64le) for conf in /usr/lib/rpm/config.*; do [ -z "${f}" ] && break; cp "${f}" autosetup; done From 4160353248899304c543e40bea00830069765cae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:29:59 +0000 Subject: [PATCH 06/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6f89b582fa4d01c5c14d7dda97a7a5838525df58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 09:42:43 +0200 Subject: [PATCH 07/13] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- fossil.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 173859f..2929735 100644 --- a/fossil.spec +++ b/fossil.spec @@ -4,7 +4,8 @@ Version: 2.24 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://www.fossil-scm.org/ Source0: %{URL}home/tarball/version-%{version}/fossil-src-%{version}.tar.gz Source1: template.config From ea3067cb384499c990696467659bcb9a9625fdca Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Fri, 8 Nov 2024 01:49:51 +0100 Subject: [PATCH 08/13] Update to 2.25 --- .gitignore | 1 + fossil.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5cdc34c..ae4090e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /fossil-src-2.20.tar.gz /fossil-src-2.23.tar.gz /fossil-src-2.24.tar.gz +/fossil-src-2.25.tar.gz diff --git a/fossil.spec b/fossil.spec index 2929735..fff7fd2 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.24 +Version: 2.25 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki diff --git a/sources b/sources index 05fe06c..4fd4f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.24.tar.gz) = 7fc7de7d947b0946866df38c6cb2215f6452d31903cae6470bb4a692816b2803eb66ea372280256e5cd00759e4d02a0ae459de2f56f39af10e873579d53d33ee +SHA512 (fossil-src-2.25.tar.gz) = ec982a6fa9655910c692829a7aa246d7e35b1b1cec96c74d3d2af69d94cee10ffe6bb5b06a10559a3ca292147af9f1dae32d406e3e31cb7ca1d6113357eab153 From 79dca19b37890d5e02c0946e9d675d29b62f1d46 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Fri, 8 Nov 2024 02:12:40 +0100 Subject: [PATCH 09/13] Re-enable tests --- disable-broken-tests.patch | 121 ------------------- fix-or-disable-broken-tests.patch | 189 ------------------------------ fossil.spec | 2 - 3 files changed, 312 deletions(-) delete mode 100644 disable-broken-tests.patch delete mode 100644 fix-or-disable-broken-tests.patch diff --git a/disable-broken-tests.patch b/disable-broken-tests.patch deleted file mode 100644 index 8015704..0000000 --- a/disable-broken-tests.patch +++ /dev/null @@ -1,121 +0,0 @@ -https://fossil-scm.org/home/info/fb4e90b662803e47 - -Index: test/utf.test -================================================================== ---- test/utf.test -+++ test/utf.test -@@ -17609,25 +17609,25 @@ - Has flag LOOK_LONG: no - Has flag LOOK_INVALID: no - Has flag LOOK_ODD: no - Has flag LOOK_SHORT: no} - --utf-check 1179 utf-check-1179-2-129-1.jnk \ --{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. --Starts with UTF-8 BOM: no --Starts with UTF-16 BOM: yes --Looks like UTF-8: yes --Has flag LOOK_NUL: no --Has flag LOOK_CR: no --Has flag LOOK_LONE_CR: no --Has flag LOOK_LF: no --Has flag LOOK_LONE_LF: no --Has flag LOOK_CRLF: no --Has flag LOOK_LONG: no --Has flag LOOK_INVALID: yes --Has flag LOOK_ODD: no --Has flag LOOK_SHORT: no} -+#utf-check 1179 utf-check-1179-2-129-1.jnk \ -+#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. -+#Starts with UTF-8 BOM: no -+#Starts with UTF-16 BOM: yes -+#Looks like UTF-8: yes -+#Has flag LOOK_NUL: no -+#Has flag LOOK_CR: no -+#Has flag LOOK_LONE_CR: no -+#Has flag LOOK_LF: no -+#Has flag LOOK_LONE_LF: no -+#Has flag LOOK_CRLF: no -+#Has flag LOOK_LONG: no -+#Has flag LOOK_INVALID: yes -+#Has flag LOOK_ODD: no -+#Has flag LOOK_SHORT: no} - - utf-check 1180 utf-check-1180-2-130-0.jnk \ - {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes. - Starts with UTF-8 BOM: no - Starts with UTF-16 BOM: yes -@@ -24121,41 +24121,41 @@ - Has flag LOOK_LONG: no - Has flag LOOK_INVALID: yes - Has flag LOOK_ODD: no - Has flag LOOK_SHORT: no} - --utf-check 1586 utf-check-1586-3-128-0.jnk \ --{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. --Starts with UTF-8 BOM: no --Starts with UTF-16 BOM: reversed --Looks like UTF-16: no --Has flag LOOK_NUL: yes --Has flag LOOK_CR: no --Has flag LOOK_LONE_CR: no --Has flag LOOK_LF: no --Has flag LOOK_LONE_LF: no --Has flag LOOK_CRLF: no --Has flag LOOK_LONG: no --Has flag LOOK_INVALID: no --Has flag LOOK_ODD: no --Has flag LOOK_SHORT: no} -- --utf-check 1587 utf-check-1587-3-128-1.jnk \ --{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. --Starts with UTF-8 BOM: no --Starts with UTF-16 BOM: reversed --Looks like UTF-8: no --Has flag LOOK_NUL: yes --Has flag LOOK_CR: no --Has flag LOOK_LONE_CR: no --Has flag LOOK_LF: no --Has flag LOOK_LONE_LF: no --Has flag LOOK_CRLF: no --Has flag LOOK_LONG: no --Has flag LOOK_INVALID: yes --Has flag LOOK_ODD: no --Has flag LOOK_SHORT: no} -+#utf-check 1586 utf-check-1586-3-128-0.jnk \ -+#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. -+#Starts with UTF-8 BOM: no -+#Starts with UTF-16 BOM: reversed -+#Looks like UTF-16: no -+#Has flag LOOK_NUL: yes -+#Has flag LOOK_CR: no -+#Has flag LOOK_LONE_CR: no -+#Has flag LOOK_LF: no -+#Has flag LOOK_LONE_LF: no -+#Has flag LOOK_CRLF: no -+#Has flag LOOK_LONG: no -+#Has flag LOOK_INVALID: no -+#Has flag LOOK_ODD: no -+#Has flag LOOK_SHORT: no} -+ -+#utf-check 1587 utf-check-1587-3-128-1.jnk \ -+#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. -+#Starts with UTF-8 BOM: no -+#Starts with UTF-16 BOM: reversed -+#Looks like UTF-8: no -+#Has flag LOOK_NUL: yes -+#Has flag LOOK_CR: no -+#Has flag LOOK_LONE_CR: no -+#Has flag LOOK_LF: no -+#Has flag LOOK_LONE_LF: no -+#Has flag LOOK_CRLF: no -+#Has flag LOOK_LONG: no -+#Has flag LOOK_INVALID: yes -+#Has flag LOOK_ODD: no -+#Has flag LOOK_SHORT: no} - - utf-check 1588 utf-check-1588-3-129-0.jnk \ - {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes. - Starts with UTF-8 BOM: no - Starts with UTF-16 BOM: no - diff --git a/fix-or-disable-broken-tests.patch b/fix-or-disable-broken-tests.patch deleted file mode 100644 index 8ff9790..0000000 --- a/fix-or-disable-broken-tests.patch +++ /dev/null @@ -1,189 +0,0 @@ -https://fossil-scm.org/home/info/5ad708085a90365f - -Index: test/amend.test -================================================================== ---- test/amend.test -+++ test/amend.test -@@ -313,10 +313,11 @@ - } - foreach res [lsort -nocase $result] { - append t2exp "sym-$res*" - } - eval fossil amend $HASH $tags -+ set t1exp [string trimleft $t1exp ,] - test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]} - fossil tag ls --raw $HASH - test amend-tag-$tc.2 {[string match $t2exp $RESULT]} - fossil timeline -n 1 - test amend-tag-$tc.3 {[string match $t3exp $RESULT]} - -Index: test/merge5.test -================================================================== ---- test/merge5.test -+++ test/merge5.test -@@ -23,11 +23,11 @@ - } - protOut { - fossil sqlite3 --no-repository reacts badly to SQL dumped from - repositories created from fossil older than version 2.0. - } --test merge5-sqlite3-issue false knownBug -+#test merge5-sqlite3-issue false knownBug - test_cleanup_then_return - - # Verify the results of a check-out - # - proc checkout-test {testid expected_content} { - -Index: test/stash.test -================================================================== ---- test/stash.test -+++ test/stash.test -@@ -168,14 +168,14 @@ - - ######## - # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS? - # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS? - --fossil stash show --test stash-1-show {[normalize_result] eq $diff_stash_1} --fossil stash diff --test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug -+#fossil stash show -+#test stash-1-show {[normalize_result] eq $diff_stash_1} -+#fossil stash diff -+#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug - - ######## - # fossil stash pop - - stash-test 2 pop { -@@ -206,16 +206,16 @@ - # fossil: ./src/delta.c:231: checksum: Assertion '...' failed. - # Should be triggered by this stash-WY-1 test. - fossil checkout --force c1 - fossil clean - fossil mv --soft f1 f1new --stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { -- REVERT f1 -- DELETE f1new --} -changes { --} -addremove { --} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} -+#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { -+# REVERT f1 -+# DELETE f1new -+#} -changes { -+#} -addremove { -+#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} - # TODO: add tests that verify the saved stash is sensible. Possibly - # by applying it and checking results. But until the SQLITE_CONSTRAINT - # error is fixed, there is nothing stashed to test. - - -@@ -296,16 +296,17 @@ - }] -changes { - RENAMED f2 -> f2n - } -addremove { - } -exists {f1 f2n} -notexists {f2} - --stash-test 3-2 {save -m f2n} { -- REVERT f2 -- DELETE f2n --} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} -+fossil stash save -m f2n -+#stash-test 3-2 {save -m f2n} { -+# REVERT f2 -+# DELETE f2n -+#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} - fossil stash show --test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug -+#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug - test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} - stash-test 3-2-pop {pop} { - UPDATE f1 - UPDATE f2n - } -changes { - -Index: test/tester.tcl -================================================================== ---- test/tester.tcl -+++ test/tester.tcl -@@ -308,10 +308,11 @@ - comment-format \ - crlf-glob \ - crnl-glob \ - default-csp \ - default-perms \ -+ default-skin \ - diff-binary \ - diff-command \ - dont-commit \ - dont-push \ - dotfiles \ - -Index: test/utf.test -================================================================== ---- test/utf.test -+++ test/utf.test -@@ -35,11 +35,11 @@ - set i 1 - foreach {fileName result} $args { - set fileName [file join $tempPath $fileName] - fossil test-looks-like-utf $fileName - set result [string map [list %TEMP% $tempPath \r\n \n] $result] -- # if {$::RESULT ne $result} {puts stdout $::RESULT} -+ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit} - test utf-check-$testname.$i {$::RESULT eq $result} - incr i - } - } - -@@ -17613,12 +17613,12 @@ - - utf-check 1179 utf-check-1179-2-129-1.jnk \ - {File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. - Starts with UTF-8 BOM: no - Starts with UTF-16 BOM: yes --Looks like UTF-8: no --Has flag LOOK_NUL: yes -+Looks like UTF-8: yes -+Has flag LOOK_NUL: no - Has flag LOOK_CR: no - Has flag LOOK_LONE_CR: no - Has flag LOOK_LF: no - Has flag LOOK_LONE_LF: no - Has flag LOOK_CRLF: no -@@ -24124,27 +24124,27 @@ - Has flag LOOK_SHORT: no} - - utf-check 1586 utf-check-1586-3-128-0.jnk \ - {File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. - Starts with UTF-8 BOM: no --Starts with UTF-16 BOM: no --Looks like UTF-8: no -+Starts with UTF-16 BOM: reversed -+Looks like UTF-16: no - Has flag LOOK_NUL: yes - Has flag LOOK_CR: no - Has flag LOOK_LONE_CR: no - Has flag LOOK_LF: no - Has flag LOOK_LONE_LF: no - Has flag LOOK_CRLF: no - Has flag LOOK_LONG: no --Has flag LOOK_INVALID: yes -+Has flag LOOK_INVALID: no - Has flag LOOK_ODD: no - Has flag LOOK_SHORT: no} - - utf-check 1587 utf-check-1587-3-128-1.jnk \ - {File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. - Starts with UTF-8 BOM: no --Starts with UTF-16 BOM: no -+Starts with UTF-16 BOM: reversed - Looks like UTF-8: no - Has flag LOOK_NUL: yes - Has flag LOOK_CR: no - Has flag LOOK_LONE_CR: no - Has flag LOOK_LF: no - diff --git a/fossil.spec b/fossil.spec index fff7fd2..aded80b 100644 --- a/fossil.spec +++ b/fossil.spec @@ -11,8 +11,6 @@ Source0: %{URL}home/tarball/version-%{version}/fossil-src-%{version}.ta Source1: template.config Source2: fossil-doc Source3: fossil-doc-README -Patch0: fix-or-disable-broken-tests.patch -Patch1: disable-broken-tests.patch BuildRequires: gcc-c++ BuildRequires: zlib-devel From bf84bf5b8dd1824037acf5c8912956f0283f6944 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:40:35 +0000 Subject: [PATCH 10/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d127e1a2c10bef86670a4d545133fa8660655990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 30 Apr 2025 22:03:30 +0200 Subject: [PATCH 11/13] Correct SPDX license --- fossil.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fossil.spec b/fossil.spec index aded80b..72cc1e9 100644 --- a/fossil.spec +++ b/fossil.spec @@ -4,8 +4,7 @@ Version: 2.25 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-2-Clause URL: https://www.fossil-scm.org/ Source0: %{URL}home/tarball/version-%{version}/fossil-src-%{version}.tar.gz Source1: template.config From 75b6fd037665040eb36ec8b2be01cd5efad6a5a5 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Thu, 1 May 2025 22:03:32 +0200 Subject: [PATCH 12/13] Update to 2.26 --- .gitignore | 1 + fossil.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ae4090e..9060484 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /fossil-src-2.23.tar.gz /fossil-src-2.24.tar.gz /fossil-src-2.25.tar.gz +/fossil-src-2.26.tar.gz diff --git a/fossil.spec b/fossil.spec index 72cc1e9..12111b2 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.25 +Version: 2.26 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki diff --git a/sources b/sources index 4fd4f2c..149b2da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.25.tar.gz) = ec982a6fa9655910c692829a7aa246d7e35b1b1cec96c74d3d2af69d94cee10ffe6bb5b06a10559a3ca292147af9f1dae32d406e3e31cb7ca1d6113357eab153 +SHA512 (fossil-src-2.26.tar.gz) = 356a3b51adde40aedb094743eb978b78961c4216152000ecd800e22b69f1e3a11330259b627628fb6e9a594b1969f0351a73af717b500b4f12d109108fa82b61 From e869f59c2a228b6b834377b46820fe19d6538904 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:43:31 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild