From 89078c9daaf2bfd28117033413a771da3288c967 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 18:51:31 +0000 Subject: [PATCH 01/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 100c405..076d97f 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ Name: fossil Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -47,6 +47,9 @@ cp /usr/lib/rpm/config.* autosetup %doc www %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c1d22421ab08aa30813f033cbb4d7204efe4e8b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:43:39 +0000 Subject: [PATCH 02/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 076d97f..9cc28b8 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ Name: fossil Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -47,6 +47,9 @@ cp /usr/lib/rpm/config.* autosetup %doc www %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0c1445d458c16aacbe4b54f914a10fffca1e39ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:02:51 +0000 Subject: [PATCH 03/48] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fossil.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 9cc28b8..30fe5c8 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ Name: fossil Version: 2.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -47,6 +47,10 @@ cp /usr/lib/rpm/config.* autosetup %doc www %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.8-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7c4ddb5e14ce7f20971493bd7f042d12b96f3682 Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Mon, 26 Oct 2020 18:55:07 -0600 Subject: [PATCH 04/48] Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106), fixes rhbz#1863577, rhbz#1870790 --- .gitignore | 1 + fossil.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6c48a0f..524fe76 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /fossil-src-1.34.tar.gz /fossil-src-2.2.tar.gz /fossil-src-2.8.tar.gz +/fossil-src-2.12.1.tar.gz diff --git a/fossil.spec b/fossil.spec index 30fe5c8..bb63461 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ Name: fossil -Version: 2.8 -Release: 5%{?dist} +Version: 2.12.1 +Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -28,7 +28,7 @@ Documentation in HTML format for %{name}. %{__rm} -f src/sqlite3.c # Update config.guess/sub to fix builds on new architectures (aarch64/ppc64le) -cp /usr/lib/rpm/config.* autosetup +for conf in /usr/lib/rpm/config.*; do [ -z "${f}" ] && break; cp "${f}" autosetup; done %build # This gives configure-without-libdir-spec, but this is done because this is not generated by autoconf (but by autosetup) @@ -47,6 +47,10 @@ cp /usr/lib/rpm/config.* autosetup %doc www %changelog +* Mon Oct 19 2020 Sheng Mao - 2.12.1-1 +- Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106) + rhbz#1863577, rhbz#1870790 + * Sat Aug 01 2020 Fedora Release Engineering - 2.8-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a378661..3fb1cbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.8.tar.gz) = 5c6a8dc1545c43b3c95fbbec343db023e27a9db58f282a881bb7e488e3e26a0f7913a41f505dedf618b884507e48956780bd0e12482e184345d68edd1e79ff8e +SHA512 (fossil-src-2.12.1.tar.gz) = 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee From 6aaf0a4e463a2fea72337dd05b1099dc3bb8b841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:44:41 +0100 Subject: [PATCH 05/48] Ensure that the compilation flags are respected --- fossil.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fossil.spec b/fossil.spec index bb63461..2db1f2e 100644 --- a/fossil.spec +++ b/fossil.spec @@ -31,6 +31,7 @@ Documentation in HTML format for %{name}. for conf in /usr/lib/rpm/config.*; do [ -z "${f}" ] && break; cp "${f}" autosetup; done %build +%set_build_flags # This gives configure-without-libdir-spec, but this is done because this is not generated by autoconf (but by autosetup) # Because of this, it does not support the --host= argument like expected, and as such %%configure cannot be used ./configure --prefix=/usr --disable-internal-sqlite --with-openssl=auto --json From 8261f81135b2104b586b4d6be203e78b1dd7f174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:45:55 +0100 Subject: [PATCH 06/48] Use %URL in Source0 --- fossil.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 2db1f2e..4c339e9 100644 --- a/fossil.spec +++ b/fossil.spec @@ -5,7 +5,7 @@ Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ -Source0: https://fossil-scm.org/index.html/uv/fossil-src-%{version}.tar.gz +Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: zlib-devel From 0710237a5e4549906de737edad447d2f1a539fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:46:21 +0100 Subject: [PATCH 07/48] Don't use rpm's internal macros --- fossil.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 4c339e9..c8f554c 100644 --- a/fossil.spec +++ b/fossil.spec @@ -25,7 +25,7 @@ Documentation in HTML format for %{name}. %prep %autosetup -%{__rm} -f src/sqlite3.c +rm -f src/sqlite3.c # 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 fa596b13e947e181c1c985c31a3476a661f978ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:46:50 +0100 Subject: [PATCH 08/48] Expand %configure macro as much as possible --- fossil.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index c8f554c..dc2cc2a 100644 --- a/fossil.spec +++ b/fossil.spec @@ -34,7 +34,25 @@ for conf in /usr/lib/rpm/config.*; do [ -z "${f}" ] && break; cp "${f}" autosetu %set_build_flags # This gives configure-without-libdir-spec, but this is done because this is not generated by autoconf (but by autosetup) # Because of this, it does not support the --host= argument like expected, and as such %%configure cannot be used -./configure --prefix=/usr --disable-internal-sqlite --with-openssl=auto --json +./configure --build=%{_build} \ + --disable-dependency-tracking \ + --prefix=%{_prefix} \ + --exec-prefix=%{_exec_prefix} \ + --bindir=%{_bindir} \ + --sbindir=%{_sbindir} \ + --sysconfdir=%{_sysconfdir} \ + --datadir=%{_datadir} \ + --includedir=%{_includedir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ + --localstatedir=%{_localstatedir} \ + --sharedstatedir=%{_sharedstatedir} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --disable-internal-sqlite \ + --with-openssl=auto \ + --json + %make_build %install From 8085140a8e8f9472c12a440fcb9d729f157c271e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:47:41 +0100 Subject: [PATCH 09/48] Fix rpmlint warnings in installed documentation --- fossil.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fossil.spec b/fossil.spec index dc2cc2a..9ed7228 100644 --- a/fossil.spec +++ b/fossil.spec @@ -54,6 +54,10 @@ for conf in /usr/lib/rpm/config.*; do [ -z "${f}" ] && break; cp "${f}" autosetu --json %make_build +# fix spurious-executable-perm +chmod -x www/collisions.ipynb +# fix env-script-interpreter +sed -i "s:^#\!/usr/bin/env\s\+tclsh\s\?$:#!%_bindir/tclsh:" www/mkindex.tcl %install %make_install From 655f5d169316988819659e4611a5d1b704a3398a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:48:39 +0100 Subject: [PATCH 10/48] Install fossil's manpage as well --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 9ed7228..bd5021c 100644 --- a/fossil.spec +++ b/fossil.spec @@ -61,10 +61,13 @@ sed -i "s:^#\!/usr/bin/env\s\+tclsh\s\?$:#!%_bindir/tclsh:" www/mkindex.tcl %install %make_install +install -D -m 0644 -t %{buildroot}%{_mandir}/man1 fossil.1 + %files %license COPYRIGHT-BSD2.txt -%{_bindir}/fossil +%{_bindir}/%name +%{_mandir}/man1/%name.1* %files doc %doc www From f00bfcf918dfed1ba284d7e9a94647115c128f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Nov 2020 23:48:58 +0100 Subject: [PATCH 11/48] Enable tests --- fossil.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fossil.spec b/fossil.spec index bd5021c..028bbde 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,3 +1,4 @@ +%bcond_without tests Name: fossil Version: 2.12.1 Release: 1%{?dist} @@ -11,6 +12,7 @@ BuildRequires: gcc-c++ BuildRequires: zlib-devel BuildRequires: sqlite-devel BuildRequires: openssl-devel +BuildRequires: tcl %description Fossil is a simple, high-reliability, distributed software configuration @@ -64,6 +66,11 @@ sed -i "s:^#\!/usr/bin/env\s\+tclsh\s\?$:#!%_bindir/tclsh:" www/mkindex.tcl install -D -m 0644 -t %{buildroot}%{_mandir}/man1 fossil.1 +%check +%if %{with tests} +tclsh test/tester.tcl %{buildroot}%{_bindir}/%name +%endif + %files %license COPYRIGHT-BSD2.txt %{_bindir}/%name From 2d26b8c7b4e2faae76aeafd238d2cdfbf7ddd98e Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Wed, 25 Nov 2020 23:38:08 -0700 Subject: [PATCH 12/48] Organize fossil documents in fossil repository format rhbz#1839024 --- fossil.spec | 20 ++++++++++++++++++-- template.config | 10 ++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 template.config diff --git a/fossil.spec b/fossil.spec index 028bbde..2f925ec 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,12 +1,13 @@ %bcond_without tests Name: fossil Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz +Source1: template.config BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -23,7 +24,8 @@ interface. Summary: Fossil documentation %description doc -Documentation in HTML format for %{name}. +Documentation in repository format for %{name}. Users can run `fossil ui` +in %{_docdir}/%{name}-doc folder to view documents in browser. %prep %autosetup @@ -71,15 +73,29 @@ install -D -m 0644 -t %{buildroot}%{_mandir}/man1 fossil.1 tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %endif + +# create a fossil repository for documents with default settings +%{buildroot}%{_bindir}/%name init --admin-user %name %name-doc.fossil +%{buildroot}%{_bindir}/%name open --empty --force %name-doc.fossil +%{buildroot}%{_bindir}/%name configuration import %{SOURCE1} +%{buildroot}%{_bindir}/%name add www +%{buildroot}%{_bindir}/%name commit --user %name --force --comment '%name-doc initial commit' + + %files %license COPYRIGHT-BSD2.txt %{_bindir}/%name %{_mandir}/man1/%name.1* %files doc +%doc %name-doc.fossil +%doc .fslckout %doc www %changelog +* Wed Nov 25 2020 Sheng Mao - 2.12.1-2 +- Organize fossil documents in fossil repository format rhbz#1839024 + * Mon Oct 19 2020 Sheng Mao - 2.12.1-1 - Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106) rhbz#1863577, rhbz#1870790 diff --git a/template.config b/template.config new file mode 100644 index 0000000..d5f1811 --- /dev/null +++ b/template.config @@ -0,0 +1,10 @@ +config /config 41 +1606368705 'timeline-plaintext' value '1' +config /config 44 +1606369015 'project-name' value 'fossil-doc' +config /config 57 +1606369069 'index-page' value '/doc/trunk/www/index.wiki' +config /config 34 +1606369257 'binary-glob' value '*' +config /config 34 +1606368705 'hash-policy' value '2' From 5167856476817c67bc636630ec412a42b09bc30a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 22:49:03 +0000 Subject: [PATCH 13/48] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- fossil.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fossil.spec b/fossil.spec index 2f925ec..872b547 100644 --- a/fossil.spec +++ b/fossil.spec @@ -14,6 +14,7 @@ BuildRequires: zlib-devel BuildRequires: sqlite-devel BuildRequires: openssl-devel BuildRequires: tcl +BuildRequires: make %description Fossil is a simple, high-reliability, distributed software configuration From 171d30bddcb62c1bd5d091075c5de343476a6b9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:49:23 +0000 Subject: [PATCH 14/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 872b547..146cdf5 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil Version: 2.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -94,6 +94,9 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %doc www %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Nov 25 2020 Sheng Mao - 2.12.1-2 - Organize fossil documents in fossil repository format rhbz#1839024 From 33eec1fd7eed7d734225afd1759df2926e8aa8fe Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Mon, 14 Dec 2020 20:19:19 -0700 Subject: [PATCH 15/48] Upgrade to fossil 2.13 --- fossil.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fossil.spec b/fossil.spec index 146cdf5..f2cce13 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil -Version: 2.12.1 -Release: 3%{?dist} +Version: 2.13 +Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -11,7 +11,7 @@ Source1: template.config BuildRequires: gcc-c++ BuildRequires: zlib-devel -BuildRequires: sqlite-devel +BuildRequires: sqlite-devel >= 3.34.0 BuildRequires: openssl-devel BuildRequires: tcl BuildRequires: make @@ -94,6 +94,9 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %doc www %changelog +* Mon Dec 14 2020 Sheng Mao - 2.13-1 +- Upgrade to fossil 2.13 + * Tue Jan 26 2021 Fedora Release Engineering - 2.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 3fb1cbb..24dfdf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.12.1.tar.gz) = 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee +SHA512 (fossil-src-2.13.tar.gz) = bd756aaac2f39005b690230c5a4ef4d618a3200a8eb499aa964285050c247edfb0abfa5db5522269e0a5ee2737c71393a523dc2d7e37eae076364185137964f8 From dab13d589c4c0b203119c562d657538827f1b61f Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Wed, 16 Dec 2020 20:03:21 -0700 Subject: [PATCH 16/48] Enable fossil-doc with searching feature --- fossil-doc | 2 ++ fossil-doc-README | 1 + fossil.spec | 20 +++++++++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 fossil-doc create mode 100644 fossil-doc-README diff --git a/fossil-doc b/fossil-doc new file mode 100644 index 0000000..a3cb5f6 --- /dev/null +++ b/fossil-doc @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/fossil ui "$@" /usr/share/doc/fossil-doc/fossil-doc.fossil diff --git a/fossil-doc-README b/fossil-doc-README new file mode 100644 index 0000000..aa14802 --- /dev/null +++ b/fossil-doc-README @@ -0,0 +1 @@ +Please run command fossil-doc to view fossil documents. \ No newline at end of file diff --git a/fossil.spec b/fossil.spec index f2cce13..f3fe85c 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,16 +1,19 @@ %bcond_without tests Name: fossil Version: 2.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz Source1: template.config +Source2: fossil-doc +Source3: fossil-doc-README BuildRequires: gcc-c++ BuildRequires: zlib-devel +BuildRequires: sqlite BuildRequires: sqlite-devel >= 3.34.0 BuildRequires: openssl-devel BuildRequires: tcl @@ -24,6 +27,8 @@ interface. %package doc Summary: Fossil documentation +Requires: fossil + %description doc Documentation in repository format for %{name}. Users can run `fossil ui` in %{_docdir}/%{name}-doc folder to view documents in browser. @@ -79,9 +84,15 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %{buildroot}%{_bindir}/%name init --admin-user %name %name-doc.fossil %{buildroot}%{_bindir}/%name open --empty --force %name-doc.fossil %{buildroot}%{_bindir}/%name configuration import %{SOURCE1} +sqlite3 %name-doc.fossil "REPLACE INTO config(name,value,mtime) VALUES('doc-glob','*.wiki,*.html,*.md,*.txt',1608172730);" %{buildroot}%{_bindir}/%name add www %{buildroot}%{_bindir}/%name commit --user %name --force --comment '%name-doc initial commit' +%{buildroot}%{_bindir}/%name fts-config enable d +%{buildroot}%{_bindir}/%name fts-config stemmer on +%{buildroot}%{_bindir}/%name fts-config index on +install -m 0755 -p -D %{SOURCE2} %{buildroot}%{_bindir} +cp %{SOURCE3} README %files %license COPYRIGHT-BSD2.txt @@ -89,11 +100,14 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name %{_mandir}/man1/%name.1* %files doc +%{_bindir}/%name-doc %doc %name-doc.fossil -%doc .fslckout -%doc www +%doc README %changelog +* Wed Dec 16 2020 Sheng Mao - 2.13-2 +- Enable fossil-doc with searching feature + * Mon Dec 14 2020 Sheng Mao - 2.13-1 - Upgrade to fossil 2.13 From 14ba3f4e78a45a0353b1b1c3cf28f89ceca1371e Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Wed, 27 Jan 2021 21:08:52 -0700 Subject: [PATCH 17/48] Upgrade to fossil 2.14 --- fossil.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fossil.spec b/fossil.spec index f3fe85c..453c8a6 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil -Version: 2.13 -Release: 2%{?dist} +Version: 2.14 +Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -105,6 +105,9 @@ cp %{SOURCE3} README %doc README %changelog +* Wed Jan 27 2021 Sheng Mao - 2.14-1 +- Upgrade to fossil 2.14 + * Wed Dec 16 2020 Sheng Mao - 2.13-2 - Enable fossil-doc with searching feature diff --git a/sources b/sources index 24dfdf4..f29e563 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.13.tar.gz) = bd756aaac2f39005b690230c5a4ef4d618a3200a8eb499aa964285050c247edfb0abfa5db5522269e0a5ee2737c71393a523dc2d7e37eae076364185137964f8 +SHA512 (fossil-src-2.14.tar.gz) = f95291886484c9fb98224c17e07c9c2ada3d79974359234f1cc6a8fce603e45bf980ffe4f43a473d74d190b6975fff66e8d35ca680747385e72981caabfd6b10 From ad25011ccaf339610531f86eedcc03ad55b868ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Sun, 7 Feb 2021 11:22:53 +0100 Subject: [PATCH 18/48] Update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 524fe76..2a07e89 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /fossil-src-2.2.tar.gz /fossil-src-2.8.tar.gz /fossil-src-2.12.1.tar.gz +/fossil-src-2.14.tar.gz From 0b8ae6a47ae1e6d8e7ee253d3062ba6631bd66fd Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Sun, 4 Jul 2021 19:30:03 -0600 Subject: [PATCH 19/48] Upgrade to fossil 2.16 --- .gitignore | 1 + fossil.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2a07e89..51284c6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /fossil-src-2.8.tar.gz /fossil-src-2.12.1.tar.gz /fossil-src-2.14.tar.gz +/fossil-2.16.tar.gz diff --git a/fossil.spec b/fossil.spec index 453c8a6..8f4ccbf 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,12 +1,12 @@ %bcond_without tests Name: fossil -Version: 2.14 +Version: 2.16 Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ -Source0: %{URL}index.html/uv/fossil-src-%{version}.tar.gz +Source0: %{URL}home/tarball/version-%{version}/fossil-%{version}.tar.gz Source1: template.config Source2: fossil-doc Source3: fossil-doc-README @@ -14,10 +14,10 @@ Source3: fossil-doc-README BuildRequires: gcc-c++ BuildRequires: zlib-devel BuildRequires: sqlite -BuildRequires: sqlite-devel >= 3.34.0 +BuildRequires: sqlite-devel >= 3.35.0 BuildRequires: openssl-devel BuildRequires: tcl -BuildRequires: make +BuildRequires: make %description Fossil is a simple, high-reliability, distributed software configuration @@ -105,6 +105,9 @@ cp %{SOURCE3} README %doc README %changelog +* Sun Jul 04 2021 Sheng Mao - 2.16-1 +- Upgrade to fossil 2.16 + * Wed Jan 27 2021 Sheng Mao - 2.14-1 - Upgrade to fossil 2.14 diff --git a/sources b/sources index f29e563..89007e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.14.tar.gz) = f95291886484c9fb98224c17e07c9c2ada3d79974359234f1cc6a8fce603e45bf980ffe4f43a473d74d190b6975fff66e8d35ca680747385e72981caabfd6b10 +SHA512 (fossil-2.16.tar.gz) = fb789cdebe117c9785e789715a21e11f399070c43e51eb521b181e56db0f8003c7027f2abf852a91a22512ae6e9370f9508be5cf6915b1bc003b00511dbb050a From c3a6aacbe844e0dae741070156c9894eee3a8019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Sat, 17 Jul 2021 22:40:10 +0200 Subject: [PATCH 20/48] Add fixed bugs to changelog --- fossil.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fossil.spec b/fossil.spec index 8f4ccbf..e9581ba 100644 --- a/fossil.spec +++ b/fossil.spec @@ -107,6 +107,7 @@ cp %{SOURCE3} README %changelog * Sun Jul 04 2021 Sheng Mao - 2.16-1 - Upgrade to fossil 2.16 +- Fixes rhbz#1921136, rhbz#1980049 * Wed Jan 27 2021 Sheng Mao - 2.14-1 - Upgrade to fossil 2.14 From da74e606ff52115654120b10bdd562fe1812655a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:15:26 +0000 Subject: [PATCH 21/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index e9581ba..3c7102c 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil Version: 2.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -105,6 +105,9 @@ cp %{SOURCE3} README %doc README %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jul 04 2021 Sheng Mao - 2.16-1 - Upgrade to fossil 2.16 - Fixes rhbz#1921136, rhbz#1980049 From ce359d222db1007e6c2f36cd5316fe7fe18a8147 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:01:44 +0200 Subject: [PATCH 22/48] Rebuilt with OpenSSL 3.0.0 --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index 3c7102c..afd34e0 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil Version: 2.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -105,6 +105,9 @@ cp %{SOURCE3} README %doc README %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.16-3 +- Rebuilt with OpenSSL 3.0.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 41ce0e3072900d0143069bbcaa7893698427afc9 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 4 Dec 2021 14:14:06 +0100 Subject: [PATCH 23/48] fossil 2.17 - Upgrade to fossil 2.17 - Change upstream URL to match FreeBSD, Homebrew, pkgsrc etc. so hashes can be compared - Switch to vendored SQLite as Fossil releases regularly require unreleased SQLite versions and both are from the same upstream anyway --- .gitignore | 1 + fossil.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 51284c6..79c0523 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /fossil-src-2.12.1.tar.gz /fossil-src-2.14.tar.gz /fossil-2.16.tar.gz +/fossil-src-2.17.tar.gz diff --git a/fossil.spec b/fossil.spec index afd34e0..cf098f2 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,23 +1,23 @@ %bcond_without tests Name: fossil -Version: 2.16 -Release: 3%{?dist} +Version: 2.17 +Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD URL: https://www.fossil-scm.org/ -Source0: %{URL}home/tarball/version-%{version}/fossil-%{version}.tar.gz +Source0: %{URL}home/tarball/version-%{version}/fossil-src-%{version}.tar.gz Source1: template.config Source2: fossil-doc Source3: fossil-doc-README BuildRequires: gcc-c++ BuildRequires: zlib-devel -BuildRequires: sqlite -BuildRequires: sqlite-devel >= 3.35.0 BuildRequires: openssl-devel BuildRequires: tcl BuildRequires: make +BuildRequires: sqlite +Provides: bundled(sqlite) = 3.36.1 %description Fossil is a simple, high-reliability, distributed software configuration @@ -34,8 +34,7 @@ Documentation in repository format for %{name}. Users can run `fossil ui` in %{_docdir}/%{name}-doc folder to view documents in browser. %prep -%autosetup -rm -f src/sqlite3.c +%autosetup -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 @@ -59,7 +58,6 @@ for conf in /usr/lib/rpm/config.*; do [ -z "${f}" ] && break; cp "${f}" autosetu --sharedstatedir=%{_sharedstatedir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ - --disable-internal-sqlite \ --with-openssl=auto \ --json @@ -105,6 +103,13 @@ cp %{SOURCE3} README %doc README %changelog +* Sat Dec 04 2021 Jonathan Schleifer - 2.17-1 +- Upgrade to fossil 2.17 +- Change upstream URL to match FreeBSD, Homebrew, pkgsrc etc. so hashes can be + compared +- Switch to vendored SQLite as Fossil releases regularly require unreleased + SQLite versions and both are from the same upstream anyway + * Tue Sep 14 2021 Sahana Prasad - 2.16-3 - Rebuilt with OpenSSL 3.0.0 diff --git a/sources b/sources index 89007e7..0a35ca9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-2.16.tar.gz) = fb789cdebe117c9785e789715a21e11f399070c43e51eb521b181e56db0f8003c7027f2abf852a91a22512ae6e9370f9508be5cf6915b1bc003b00511dbb050a +SHA512 (fossil-src-2.17.tar.gz) = 61b0cfa3ffe451a245647a225957daa00586dc82f87a16e0e5d478b19272b2d678f3ebcdf44b2de52211260bfb2735f190e8975d43137e0acd8f58bfdc3953fe From 5b7426ff90043a059e02d53ebbeee4d07754bdd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:18:51 +0000 Subject: [PATCH 24/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fossil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fossil.spec b/fossil.spec index cf098f2..828f4f1 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil Version: 2.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -103,6 +103,9 @@ cp %{SOURCE3} README %doc README %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Dec 04 2021 Jonathan Schleifer - 2.17-1 - Upgrade to fossil 2.17 - Change upstream URL to match FreeBSD, Homebrew, pkgsrc etc. so hashes can be From 93a929e028aa8823e84cfe7ff7b2024262d29b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 24 Feb 2022 22:59:21 +0100 Subject: [PATCH 25/48] New upstream release 2.18 --- .gitignore | 1 + fossil.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 79c0523..97f5968 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /fossil-src-2.14.tar.gz /fossil-2.16.tar.gz /fossil-src-2.17.tar.gz +/fossil-src-2.18.tar.gz diff --git a/fossil.spec b/fossil.spec index 828f4f1..a671056 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil -Version: 2.17 -Release: 2%{?dist} +Version: 2.18 +Release: 1%{?dist} Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -17,7 +17,7 @@ BuildRequires: openssl-devel BuildRequires: tcl BuildRequires: make BuildRequires: sqlite -Provides: bundled(sqlite) = 3.36.1 +Provides: bundled(sqlite) = 3.38.0 %description Fossil is a simple, high-reliability, distributed software configuration @@ -103,6 +103,9 @@ cp %{SOURCE3} README %doc README %changelog +* Thu Feb 24 2022 Dan Čermák - 2.18-1 +- New upstream release 2.18 + * Thu Jan 20 2022 Fedora Release Engineering - 2.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 0a35ca9..11f8ec7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.17.tar.gz) = 61b0cfa3ffe451a245647a225957daa00586dc82f87a16e0e5d478b19272b2d678f3ebcdf44b2de52211260bfb2735f190e8975d43137e0acd8f58bfdc3953fe +SHA512 (fossil-src-2.18.tar.gz) = 9dfeef1cc394af7afc6b68d2ebf084d5962698123518999130162718d450d061ab286b5f4039cde1af0e17059a9c801f1ded974fdb78b0965b73a7f8c80fd277 From 7637ef0733c616af35a863a656bd9cfa3a466755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 24 Feb 2022 23:01:21 +0100 Subject: [PATCH 26/48] Switch to rpmautospec --- changelog | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++ fossil.spec | 130 +--------------------------------------------------- 2 files changed, 129 insertions(+), 128 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..5df1f89 --- /dev/null +++ b/changelog @@ -0,0 +1,127 @@ +* Thu Feb 24 2022 Dan Čermák - 2.18-1 +- New upstream release 2.18 + +* Thu Jan 20 2022 Fedora Release Engineering - 2.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Dec 04 2021 Jonathan Schleifer - 2.17-1 +- Upgrade to fossil 2.17 +- Change upstream URL to match FreeBSD, Homebrew, pkgsrc etc. so hashes can be + compared +- Switch to vendored SQLite as Fossil releases regularly require unreleased + SQLite versions and both are from the same upstream anyway + +* Tue Sep 14 2021 Sahana Prasad - 2.16-3 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 2.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jul 04 2021 Sheng Mao - 2.16-1 +- Upgrade to fossil 2.16 +- Fixes rhbz#1921136, rhbz#1980049 + +* Wed Jan 27 2021 Sheng Mao - 2.14-1 +- Upgrade to fossil 2.14 + +* Wed Dec 16 2020 Sheng Mao - 2.13-2 +- Enable fossil-doc with searching feature + +* Mon Dec 14 2020 Sheng Mao - 2.13-1 +- Upgrade to fossil 2.13 + +* Tue Jan 26 2021 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 25 2020 Sheng Mao - 2.12.1-2 +- Organize fossil documents in fossil repository format rhbz#1839024 + +* Mon Oct 19 2020 Sheng Mao - 2.12.1-1 +- Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106) + rhbz#1863577, rhbz#1870790 + +* Sat Aug 01 2020 Fedora Release Engineering - 2.8-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 04 2019 Filipe Rosset - 2.8-1 +- Update to 2.8 fixes rhbz#1581180 rhbz#1603993 rhbz#1674893 and rhbz#1524335 +- Removed upstreamed patch +- Bug 1524335 - CVE-2017-17459 fossil: Command injection via malicious ssh URLs [fedora-all] +- Bug 1581180 - Update fossil version to 2.6 (currently is 2.2) +- Bug 1603993 - fossil: FTBFS in Fedora rawhide +- Bug 1674893 - fossil: FTBFS in Fedora rawhide/f30 + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Apr 28 2017 Patrick Uiterwijk - 2.2-2 +- Update source URL +- Add patch to drop extra groups + +* Fri Apr 28 2017 Patrick Uiterwijk - 2.2-1 +- Rebase to 2.2 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Mar 20 2016 Divya Cote - 1.34-1 +- Update to latest release + +* Wed Feb 03 2016 Fedora Release Engineering - 1.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 27 2015 Patrick Uiterwijk - 1.33-1 +- Update to latest release + +* Sat Aug 16 2014 Fedora Release Engineering - 1.28-4.20140127173344 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jun 16 2014 Peter Robinson 1.28-3.20140127173344 +- Update config.guess/sub to fix ftbfs on new architectures (aarch64/ppc64le) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.28-2.20140127173344 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Jan 29 2014 Patrick Uiterwijk - 1.28-1.20140127173344 +- Update to 1.28 +- Remove patch to use system sqlite + +* Sat Aug 03 2013 Fedora Release Engineering - 1.25-3.20130216000435 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 07 2013 Patrick Uiterwijk - 1.25-2.20130216000435 +- Update file permissions for bin/fossil + +* Fri May 03 2013 Patrick Uiterwijk - 1.25-1.20130216000435 +- Update packaging + +* Tue Sep 08 2009 Silas Sewell - 0.0-0.2.20090828225927 +- Add doc subpackage and make optflags + +* Mon Sep 07 2009 Silas Sewell - 0.0-0.1.20090828225927 +- Initial package diff --git a/fossil.spec b/fossil.spec index a671056..664a2db 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: fossil Version: 2.18 -Release: 1%{?dist} +Release: %autorelease Summary: A distributed SCM with bug tracking and wiki License: BSD @@ -103,130 +103,4 @@ cp %{SOURCE3} README %doc README %changelog -* Thu Feb 24 2022 Dan Čermák - 2.18-1 -- New upstream release 2.18 - -* Thu Jan 20 2022 Fedora Release Engineering - 2.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Dec 04 2021 Jonathan Schleifer - 2.17-1 -- Upgrade to fossil 2.17 -- Change upstream URL to match FreeBSD, Homebrew, pkgsrc etc. so hashes can be - compared -- Switch to vendored SQLite as Fossil releases regularly require unreleased - SQLite versions and both are from the same upstream anyway - -* Tue Sep 14 2021 Sahana Prasad - 2.16-3 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Jul 21 2021 Fedora Release Engineering - 2.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 04 2021 Sheng Mao - 2.16-1 -- Upgrade to fossil 2.16 -- Fixes rhbz#1921136, rhbz#1980049 - -* Wed Jan 27 2021 Sheng Mao - 2.14-1 -- Upgrade to fossil 2.14 - -* Wed Dec 16 2020 Sheng Mao - 2.13-2 -- Enable fossil-doc with searching feature - -* Mon Dec 14 2020 Sheng Mao - 2.13-1 -- Upgrade to fossil 2.13 - -* Tue Jan 26 2021 Fedora Release Engineering - 2.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Nov 25 2020 Sheng Mao - 2.12.1-2 -- Organize fossil documents in fossil repository format rhbz#1839024 - -* Mon Oct 19 2020 Sheng Mao - 2.12.1-1 -- Upgrade to fossil 2.12.1 after adding FTS4 to system-wide sqlite (rhbz#1887106) - rhbz#1863577, rhbz#1870790 - -* Sat Aug 01 2020 Fedora Release Engineering - 2.8-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 04 2019 Filipe Rosset - 2.8-1 -- Update to 2.8 fixes rhbz#1581180 rhbz#1603993 rhbz#1674893 and rhbz#1524335 -- Removed upstreamed patch -- Bug 1524335 - CVE-2017-17459 fossil: Command injection via malicious ssh URLs [fedora-all] -- Bug 1581180 - Update fossil version to 2.6 (currently is 2.2) -- Bug 1603993 - fossil: FTBFS in Fedora rawhide -- Bug 1674893 - fossil: FTBFS in Fedora rawhide/f30 - -* Thu Jan 31 2019 Fedora Release Engineering - 2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Apr 28 2017 Patrick Uiterwijk - 2.2-2 -- Update source URL -- Add patch to drop extra groups - -* Fri Apr 28 2017 Patrick Uiterwijk - 2.2-1 -- Rebase to 2.2 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.34-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Mar 20 2016 Divya Cote - 1.34-1 -- Update to latest release - -* Wed Feb 03 2016 Fedora Release Engineering - 1.33-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 27 2015 Patrick Uiterwijk - 1.33-1 -- Update to latest release - -* Sat Aug 16 2014 Fedora Release Engineering - 1.28-4.20140127173344 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Jun 16 2014 Peter Robinson 1.28-3.20140127173344 -- Update config.guess/sub to fix ftbfs on new architectures (aarch64/ppc64le) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.28-2.20140127173344 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Jan 29 2014 Patrick Uiterwijk - 1.28-1.20140127173344 -- Update to 1.28 -- Remove patch to use system sqlite - -* Sat Aug 03 2013 Fedora Release Engineering - 1.25-3.20130216000435 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 07 2013 Patrick Uiterwijk - 1.25-2.20130216000435 -- Update file permissions for bin/fossil - -* Fri May 03 2013 Patrick Uiterwijk - 1.25-1.20130216000435 -- Update packaging - -* Tue Sep 08 2009 Silas Sewell - 0.0-0.2.20090828225927 -- Add doc subpackage and make optflags - -* Mon Sep 07 2009 Silas Sewell - 0.0-0.1.20090828225927 -- Initial package +%autochangelog From 808a9562be15bcbceec25d8c83215eb40ce7db3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:30:14 +0000 Subject: [PATCH 27/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c1a79bebe29fc6eb1586b06de8c65a98f4dda072 Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Sun, 24 Jul 2022 15:19:56 -0700 Subject: [PATCH 28/48] New upstream release 2.19 --- .gitignore | 1 + changelog | 3 +++ fossil.spec | 2 +- sources | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 97f5968..859f797 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /fossil-2.16.tar.gz /fossil-src-2.17.tar.gz /fossil-src-2.18.tar.gz +/fossil-src-2.19.tar.gz diff --git a/changelog b/changelog index 5df1f89..4612644 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Sun Jul 24 2022 Sheng Mao - 2.19-1 +- New upstream release 2.19 + * Thu Feb 24 2022 Dan Čermák - 2.18-1 - New upstream release 2.18 diff --git a/fossil.spec b/fossil.spec index 664a2db..641391d 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.18 +Version: 2.19 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki diff --git a/sources b/sources index 11f8ec7..afef46a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.18.tar.gz) = 9dfeef1cc394af7afc6b68d2ebf084d5962698123518999130162718d450d061ab286b5f4039cde1af0e17059a9c801f1ded974fdb78b0965b73a7f8c80fd277 +SHA512 (fossil-src-2.19.tar.gz) = fcd84df2d84c3a958bb19228de4320456382d3c925717c58bec42de86d96383a9208fb31ba6aaeccd9bc6bba949048d5c1ce3d2b3e8535951956ae18d9aa34e4 From 370a0af417cdc749395b463df436fe144d953832 Mon Sep 17 00:00:00 2001 From: ivz hh Date: Thu, 24 Nov 2022 10:02:30 -0800 Subject: [PATCH 29/48] New upstream release 2.20 --- changelog | 3 +++ fossil.spec | 2 +- sources | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 4612644..bb19ebb 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Thu Nov 24 2022 Sheng Mao - 2.20-1 +- New upstream release 2.20 + * Sun Jul 24 2022 Sheng Mao - 2.19-1 - New upstream release 2.19 diff --git a/fossil.spec b/fossil.spec index 641391d..628f33f 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.19 +Version: 2.20 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki diff --git a/sources b/sources index afef46a..c71781a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.19.tar.gz) = fcd84df2d84c3a958bb19228de4320456382d3c925717c58bec42de86d96383a9208fb31ba6aaeccd9bc6bba949048d5c1ce3d2b3e8535951956ae18d9aa34e4 +SHA512 (fossil-src-2.20.tar.gz) = 39d28957e7f078a3563005d180c99d92ca77d1c972d33e436b1f46780f61e4e0c79c5b0d3f4a0497c85b728d1b2e37d45a1054db7747e62433bc60a52e55db4d From 1b1ee488bc1ec49c2ff8e3c6de5c21d07c6dae7d Mon Sep 17 00:00:00 2001 From: ivz hh Date: Thu, 24 Nov 2022 10:20:29 -0800 Subject: [PATCH 30/48] Update gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 859f797..0708531 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /fossil-src-2.17.tar.gz /fossil-src-2.18.tar.gz /fossil-src-2.19.tar.gz +/fossil-src-2.20.tar.gz From 22199738f6e353a8341ea53dfc261f78c5fa49b4 Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Fri, 25 Nov 2022 09:08:51 -0800 Subject: [PATCH 31/48] New upstream release 2.20 - Revert changelog changes as rpmautospec takes care of it --- changelog | 3 --- 1 file changed, 3 deletions(-) diff --git a/changelog b/changelog index bb19ebb..4612644 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,3 @@ -* Thu Nov 24 2022 Sheng Mao - 2.20-1 -- New upstream release 2.20 - * Sun Jul 24 2022 Sheng Mao - 2.19-1 - New upstream release 2.19 From cef035e1ff0679d815840c98f2e894304431147a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:46:31 +0000 Subject: [PATCH 32/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7c1463a8994cb6a8229d4cb7ced2b6cff4ffc860 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 3 Jun 2023 12:39:24 +0200 Subject: [PATCH 33/48] New upstream release 2.22 --- fossil.spec | 5 ++--- sources | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fossil.spec b/fossil.spec index 628f33f..e8a4f88 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.20 +Version: 2.22 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki @@ -80,13 +80,12 @@ tclsh test/tester.tcl %{buildroot}%{_bindir}/%name # create a fossil repository for documents with default settings %{buildroot}%{_bindir}/%name init --admin-user %name %name-doc.fossil -%{buildroot}%{_bindir}/%name open --empty --force %name-doc.fossil +%{buildroot}%{_bindir}/%name open --force %name-doc.fossil %{buildroot}%{_bindir}/%name configuration import %{SOURCE1} sqlite3 %name-doc.fossil "REPLACE INTO config(name,value,mtime) VALUES('doc-glob','*.wiki,*.html,*.md,*.txt',1608172730);" %{buildroot}%{_bindir}/%name add www %{buildroot}%{_bindir}/%name commit --user %name --force --comment '%name-doc initial commit' %{buildroot}%{_bindir}/%name fts-config enable d -%{buildroot}%{_bindir}/%name fts-config stemmer on %{buildroot}%{_bindir}/%name fts-config index on install -m 0755 -p -D %{SOURCE2} %{buildroot}%{_bindir} diff --git a/sources b/sources index c71781a..7877d43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.20.tar.gz) = 39d28957e7f078a3563005d180c99d92ca77d1c972d33e436b1f46780f61e4e0c79c5b0d3f4a0497c85b728d1b2e37d45a1054db7747e62433bc60a52e55db4d +SHA512 (fossil-src-2.22.tar.gz) = 99a456301ae4ac72449985ff3b8b2139b805ff84e27ffe4325bad0c90643dd51c655b0210cbfa290a621e33e42e1e35b75a6cdc1beb093221d2b5d23d64591bc From d5676dc9cf1ea07b3d00d8745410e1272b553da7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:05:52 +0000 Subject: [PATCH 34/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 51b8fb386a42cc796834f767e2b422ff6e013245 Mon Sep 17 00:00:00 2001 From: Sheng Mao Date: Sat, 4 Nov 2023 15:45:14 -0700 Subject: [PATCH 35/48] Fossil upstream update: 2.23 (2023-11-01) Highlights: * Update built-in libraries SQLite, ZLib, Pikchr to their latest versions. * Fix a regression bug introduced in version 2.22 that caused FTS5 searches to fail for terms containing non-ASCII characters. * UI improvements --- .gitignore | 1 + fossil.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0708531..621d14f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /fossil-src-2.18.tar.gz /fossil-src-2.19.tar.gz /fossil-src-2.20.tar.gz +/fossil-src-2.23.tar.gz diff --git a/fossil.spec b/fossil.spec index e8a4f88..bdde75c 100644 --- a/fossil.spec +++ b/fossil.spec @@ -1,6 +1,6 @@ %bcond_without tests Name: fossil -Version: 2.22 +Version: 2.23 Release: %autorelease Summary: A distributed SCM with bug tracking and wiki diff --git a/sources b/sources index 7877d43..3e279c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fossil-src-2.22.tar.gz) = 99a456301ae4ac72449985ff3b8b2139b805ff84e27ffe4325bad0c90643dd51c655b0210cbfa290a621e33e42e1e35b75a6cdc1beb093221d2b5d23d64591bc +SHA512 (fossil-src-2.23.tar.gz) = bba67e16b26b97aa40023a4a2aa3b2abfc9393ec8d3244ec88dab5b7d2c4d46e7d6ee89b008a6bce1f18c96c351c8d41d64f02ba28c0eb3eb04d01e308f3335b From baace326001671d887b5091d242471c7c02ec094 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:39:53 +0000 Subject: [PATCH 36/48] 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 37/48] 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 38/48] 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 39/48] 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 40/48] 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 41/48] 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 42/48] 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 43/48] 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 44/48] 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 45/48] 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 46/48] 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 47/48] 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 48/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild