From d2091208863a2a679a22e23c508ad49d0c5e8a7e Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 18 Jan 2022 15:29:34 -0800 Subject: [PATCH 01/11] Fix dnf-plugins-core build --- SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec b/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec index b67b58aacf8..a26136a3c39 100644 --- a/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec +++ b/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec @@ -11,7 +11,7 @@ Distribution: Mariner Name: dnf-plugins-core Version: 4.0.18 -Release: 4%{?dist} +Release: 15%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core @@ -68,8 +68,9 @@ Summary: Core Plugins for DNF %{?python_provide:%python_provide python3-%{name}} BuildRequires: python3-devel BuildRequires: python3-dnf >= %{dnf_lowest_compatible} +%if %{with_check} BuildRequires: python3-nose - +%endif Requires: python3-distro Requires: python3-dnf >= %{dnf_lowest_compatible} @@ -399,6 +400,9 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %endif %changelog +* Tue Jan 18 2022 Thomas Crain - 4.0.18-5 +- Only require python3-nose when building tests + * Tue Aug 10 2021 Thomas Crain - 4.0.18-4 - Remove python2 support, distro-specific checks From 5b0745a8a651a5e287f896fdfcdb2d128786dae4 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 18 Jan 2022 15:29:10 -0800 Subject: [PATCH 02/11] Fix ocaml-findlib build --- .../ocaml-findlib/bytes-lib-detection.patch | 26 +++++++++++++++++++ .../ocaml-findlib/ocaml-findlib.spec | 15 +++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 SPECS-EXTENDED/ocaml-findlib/bytes-lib-detection.patch diff --git a/SPECS-EXTENDED/ocaml-findlib/bytes-lib-detection.patch b/SPECS-EXTENDED/ocaml-findlib/bytes-lib-detection.patch new file mode 100644 index 00000000000..28cef08d87a --- /dev/null +++ b/SPECS-EXTENDED/ocaml-findlib/bytes-lib-detection.patch @@ -0,0 +1,26 @@ +From 5f1b253a84215d7f83e43bb8a5e247cf44fff569 Mon Sep 17 00:00:00 2001 +From: Thomas Crain +Date: Tue, 18 Jan 2022 15:12:19 -0800 +Subject: [PATCH] Make bytes lib detection work for ocaml 4.13 + +--- + configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 64656f2..630c319 100755 +--- a/configure ++++ b/configure +@@ -543,7 +543,8 @@ fi + # bytes? + + if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \ +- -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" ]; then ++ -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" -o \ ++ -f "${ocaml_core_stdlib}/stdlib__Bytes.cmi" ]; then + echo "bytes: found, installing fake library" + lbytes="bytes" + cbytes=0 +-- +2.25.1 + diff --git a/SPECS-EXTENDED/ocaml-findlib/ocaml-findlib.spec b/SPECS-EXTENDED/ocaml-findlib/ocaml-findlib.spec index d7ac30c8442..d97837fc236 100644 --- a/SPECS-EXTENDED/ocaml-findlib/ocaml-findlib.spec +++ b/SPECS-EXTENDED/ocaml-findlib/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -8,7 +8,7 @@ Vendor: Microsoft Corporation Distribution: Mariner URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz - +Patch0: bytes-lib-detection.patch BuildRequires: ocaml >= 4.02.0 # BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel @@ -37,7 +37,7 @@ developing applications that use %{name}. %prep -%setup -q -n findlib-%{version} +%autosetup -p1 -n findlib-%{version} %build @@ -69,7 +69,8 @@ make install \ %files -%doc LICENSE doc/README +%license LICENSE +%doc doc/README %config(noreplace) %{_sysconfdir}/ocamlfind.conf %{_bindir}/* %{_mandir}/man1/* @@ -90,7 +91,7 @@ make install \ %files devel -%doc LICENSE doc/README doc/guide-html +%doc doc/README doc/guide-html %ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/findlib/*.a %{_libdir}/ocaml/findlib/*.cmxa @@ -100,6 +101,10 @@ make install \ %changelog +* Tue Jan 18 2022 Thomas Crain - 1.8.1-15 +- Patch stdlib bytes library detection for ocaml 4.13 +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 1.8.1-14 - Switching to using full number for the 'Release' tag. From 7ebe9e0fdb007c1694ce698d750bebe4011deba3 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 16:33:51 -0800 Subject: [PATCH 03/11] Add systemd-devel BR to hfsplus-tools --- SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec b/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec index 5fdea09456e..e64fc9bea51 100644 --- a/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec +++ b/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec @@ -2,7 +2,7 @@ Vendor: Microsoft Corporation Distribution: Mariner Name: hfsplus-tools Version: 540.1.linux3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Tools to create/check Apple HFS+ filesystems License: APSL 2.0 @@ -14,14 +14,10 @@ Patch1: hfsplus-tools-learn-to-stdarg.patch Source100: http://www.opensource.org/licenses/apsl-2.0.txt -BuildRequires: gcc +BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: libuuid-devel - -# those tools are outdated, given the rebuilt mkfs/fsck.hfsplus in this -# package. However, I don't want to Obsolete that package yet, as some people -# may have a valid use for it on their systems. -Conflicts: hfsplusutils +BuildRequires: systemd-devel # we want this to end up with the other mkfs.*'s, in /sbin %define _exec_prefix / @@ -92,6 +88,9 @@ ln -s fsck.hfsplus.8 fsck.hfs.8 %changelog +* Tue Jan 18 2022 Thomas Crain - 540.1.linux3-21 +- Add BR on systemd-devel + * Fri Oct 15 2021 Pawel Winogrodzki - 540.1.linux3-20 - Initial CBL-Mariner import from Fedora 32 (license: MIT). From d1419ec161c3b4b3105137ebf1b43c888949a264 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 16:41:13 -0800 Subject: [PATCH 04/11] Fix release number for dnf-plugins-core --- SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec b/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec index a26136a3c39..ba8b42583a9 100644 --- a/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec +++ b/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec @@ -11,7 +11,7 @@ Distribution: Mariner Name: dnf-plugins-core Version: 4.0.18 -Release: 15%{?dist} +Release: 5%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core From a7a9eb0ef0c9a36b314e82b86200bee13ddc6bbc Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 16:55:41 -0800 Subject: [PATCH 05/11] Revert "Add systemd-devel BR to hfsplus-tools" This reverts commit 10058326c5104ea79cda16ecbdb75540478c60e0. --- SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec b/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec index e64fc9bea51..5fdea09456e 100644 --- a/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec +++ b/SPECS-EXTENDED/hfsplus-tools/hfsplus-tools.spec @@ -2,7 +2,7 @@ Vendor: Microsoft Corporation Distribution: Mariner Name: hfsplus-tools Version: 540.1.linux3 -Release: 21%{?dist} +Release: 20%{?dist} Summary: Tools to create/check Apple HFS+ filesystems License: APSL 2.0 @@ -14,10 +14,14 @@ Patch1: hfsplus-tools-learn-to-stdarg.patch Source100: http://www.opensource.org/licenses/apsl-2.0.txt -BuildRequires: gcc +BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: libuuid-devel -BuildRequires: systemd-devel + +# those tools are outdated, given the rebuilt mkfs/fsck.hfsplus in this +# package. However, I don't want to Obsolete that package yet, as some people +# may have a valid use for it on their systems. +Conflicts: hfsplusutils # we want this to end up with the other mkfs.*'s, in /sbin %define _exec_prefix / @@ -88,9 +92,6 @@ ln -s fsck.hfsplus.8 fsck.hfs.8 %changelog -* Tue Jan 18 2022 Thomas Crain - 540.1.linux3-21 -- Add BR on systemd-devel - * Fri Oct 15 2021 Pawel Winogrodzki - 540.1.linux3-20 - Initial CBL-Mariner import from Fedora 32 (license: MIT). From 8fd68fbf4d683f827f6de728f95c2ec72eba34ea Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 16:39:43 -0800 Subject: [PATCH 06/11] Fix config.guess/config.sub usage in zfs-fuse --- SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec b/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec index 1343466067d..90a6836fd05 100644 --- a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec +++ b/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec @@ -3,7 +3,7 @@ Distribution: Mariner %define _hardened_build 1 Name: zfs-fuse Version: 0.7.2.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: ZFS ported to Linux FUSE License: CDDL URL: https://github.com/gordan-bobic/zfs-fuse @@ -52,7 +52,6 @@ chmod -x contrib/test-datasets chmod -x contrib/find-binaries chmod -x contrib/solaris/fixfiles.py chmod -x contrib/zfsstress.py -cp -f /usr/lib/rpm/config.{guess,sub} src/lib/libumem/ %build export CCFLAGS="%{optflags}" @@ -128,6 +127,9 @@ rm -rf /var/lock/zfs %{_mandir}/man8/zstreamdump.8.gz %changelog +* Tue Jan 18 2022 Thomas Crain - 0.7.2.2-16 +- Remove copying of RPM's config.guess/config.sub into build dir (not shipped by RPM anymore) + * Thu Jun 17 2021 Pawel Winogrodzki - 0.7.2.2-15 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Making SConstruct split 'CFLAGS' before saving them to the build environment. From 57d88c4a0d2b958ef8b969d08cb3396791ed99cc Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 16:51:05 -0800 Subject: [PATCH 07/11] Verify dnf-plugins-core license --- SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec b/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec index ba8b42583a9..9e4fcd15b4a 100644 --- a/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec +++ b/SPECS-EXTENDED/dnf-plugins-core/dnf-plugins-core.spec @@ -402,6 +402,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %changelog * Tue Jan 18 2022 Thomas Crain - 4.0.18-5 - Only require python3-nose when building tests +- License verified * Tue Aug 10 2021 Thomas Crain - 4.0.18-4 - Remove python2 support, distro-specific checks From b6577694fade7b17ca930384d1d4a3c8a7c1a5a9 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 17:00:31 -0800 Subject: [PATCH 08/11] Rest of the verifications --- SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec b/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec index 90a6836fd05..d8ec821d149 100644 --- a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec +++ b/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec @@ -129,6 +129,7 @@ rm -rf /var/lock/zfs %changelog * Tue Jan 18 2022 Thomas Crain - 0.7.2.2-16 - Remove copying of RPM's config.guess/config.sub into build dir (not shipped by RPM anymore) +- License verified * Thu Jun 17 2021 Pawel Winogrodzki - 0.7.2.2-15 - Initial CBL-Mariner import from Fedora 32 (license: MIT). From 1d818114bb7cc47c3d33a044adc3a42ed7db495b Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 19 Jan 2022 17:08:43 -0800 Subject: [PATCH 09/11] Fix zfs-fuse source url --- SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec b/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec index d8ec821d149..25a06237698 100644 --- a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec +++ b/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec @@ -7,7 +7,7 @@ Release: 16%{?dist} Summary: ZFS ported to Linux FUSE License: CDDL URL: https://github.com/gordan-bobic/zfs-fuse -Source00: http://github.com/gordan-bobic/zfs-fuse/archive/%{name}-%{version}.tar.gz +Source00: http://github.com/gordan-bobic/zfs-fuse/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source01: zfs-fuse.service Source02: zfs-fuse.scrub Source03: zfs-fuse.sysconfig @@ -129,6 +129,7 @@ rm -rf /var/lock/zfs %changelog * Tue Jan 18 2022 Thomas Crain - 0.7.2.2-16 - Remove copying of RPM's config.guess/config.sub into build dir (not shipped by RPM anymore) +- Update Source0 URL - License verified * Thu Jun 17 2021 Pawel Winogrodzki - 0.7.2.2-15 From f4f79111fa52587eb8fbc0e290c88ff21710f1bf Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Fri, 21 Jan 2022 12:34:59 -0800 Subject: [PATCH 10/11] Empty commit to re-trigger actions From 56394b019809c58ab79bce50ea7076d1a101531c Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Fri, 21 Jan 2022 12:44:13 -0800 Subject: [PATCH 11/11] Fix cgmanifest for zfs-fuse --- cgmanifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgmanifest.json b/cgmanifest.json index 7f06eb66b82..f64440ca69b 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -30371,7 +30371,7 @@ "other": { "name": "zfs-fuse", "version": "0.7.2.2", - "downloadUrl": "http://github.com/gordan-bobic/zfs-fuse/archive/zfs-fuse-0.7.2.2.tar.gz" + "downloadUrl": "http://github.com/gordan-bobic/zfs-fuse/archive/refs/tags/0.7.2.2.tar.gz" } } },