[main extended] Fix dnf-plugins-core, ocaml-findlib builds (#1950)

Author: oliviacrain

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:        5%{?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,10 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %endif
 
 %changelog
+* Tue Jan 18 2022 Thomas Crain <[email protected]> - 4.0.18-5
+- Only require python3-nose when building tests
+- License verified
+
 * Tue Aug 10 2021 Thomas Crain <[email protected]>  - 4.0.18-4
 - Remove python2 support, distro-specific checks
 

SPECS-EXTENDED/ocaml-findlib/bytes-lib-detection.patch

@@ -0,0 +1,26 @@
+From 5f1b253a84215d7f83e43bb8a5e247cf44fff569 Mon Sep 17 00:00:00 2001
+From: Thomas Crain <[email protected]>
+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
+

SPECS-EXTENDED/ocaml-findlib/ocaml-findlib.spec

@@ -1,14 +1,14 @@
 Name:           ocaml-findlib
 Version:        1.8.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Objective CAML package manager and build helper
 License:        BSD
 
 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 <[email protected]> - 1.8.1-15
+- Patch stdlib bytes library detection for ocaml 4.13
+- License verified
+
 * Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 1.8.1-14
 - Switching to using full number for the 'Release' tag.
 

SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec

@@ -3,11 +3,11 @@ 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
-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
@@ -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,11 @@ rm -rf /var/lock/zfs
 %{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
+* Tue Jan 18 2022 Thomas Crain <[email protected]> - 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 <[email protected]> - 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.

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"
         }
       }
     },