update to 0.36

hpc · Feb 9, 2024 · b0c2651 · b0c2651
1 parent 524059d
commit b0c2651
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 46 deletions.
diff --git a/packaging/fedora/charliecloud.spec b/packaging/fedora/charliecloud.spec
@@ -16,13 +16,12 @@ Summary:       Lightweight user-defined software stacks for high-performance com
 License:       ASL 2.0
 URL:           https://hpc.github.io/%{name}/
 Source0:       https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires: gcc rsync bash
-Requires:      squashfuse squashfs-tools findutils
+BuildRequires: gcc rsync bash findutils
 Patch0:        el7-pkgdir.patch
-%if 0%{?fedora} > 36
-BuildRequires: fuse3 fuse3-libs fuse3-devel squashfuse-devel
-Requires:      fuse3-libs squashfuse
-Patch1:        no-rpath.patch
+%if 0%{?fedora} > 36 || 0%{?rhel} > 8
+Requires:      fuse3 squashfuse
+BuildRequires: fuse3-libs fuse3-devel squashfuse-devel
+Patch1:        no-squashfuse-rpath.patch
 %endif
 
 %description
@@ -39,18 +38,16 @@ For more information: https://hpc.github.io/charliecloud
 %package builder
 Summary:       Charliecloud container image building tools
 License:       ASL 2.0 and MIT
-BuildArch:     noarch
 BuildRequires: python3-devel
 BuildRequires: python%{python3_pkgversion}-requests
 Requires:      %{name}
 Requires:      python3
 Requires:      python%{python3_pkgversion}-requests
-Provides:      bundled(python%{python3_pkgversion}-lark-parser) = 0.11.3
-%if 0%{?fedora} > 34 || 0%{?rhel} > 8
-Requires:        git >= 2.28.1
+%if 1%{?el7}
+Requires:      git >= 2.28.1
 %endif
-%{?el8:Requires: git >= 2.28.1}
-%{?el9:Requires: git >= 2.28.1}
+Provides:      bundled(python%{python3_pkgversion}-lark-parser) = 1.1.9
+%{?el7:BuildArch: noarch}
 
 %description builder
 This package provides ch-image, Charliecloud's completely unprivileged container
@@ -81,12 +78,10 @@ Test fixtures for %{name}.
 %setup -q
 
 %if 0%{?el7}
-# el7 mock builds use "%patchN".
 %patch0 -p1
 %endif
 
 %if 0%{?fedora} > 36
-# fedora/rhel use "%patch N".
 %patch 1 -p1
 %endif
 
@@ -97,6 +92,9 @@ CFLAGS=${CFLAGS:-%optflags -fgnu89-inline}; export CFLAGS
 %configure --docdir=%{_pkgdocdir} \
            --libdir=%{_prefix}/lib \
            --with-python=/usr/bin/python3 \
+%if 0%{?fedora} > 34 || 0%{?rhel} > 8
+           --with-libsquashfusei=/usr \
+%endif
 %if 0%{?el7}
            --with-sphinx-build=%{_bindir}/sphinx-build-3.6
 %else
@@ -185,5 +183,5 @@ ln -s "${sphinxdir}/js"    %{buildroot}%{_pkgdocdir}/html/_static/js
 %{_mandir}/man1/ch-test.1*
 
 %changelog
-* Thu Apr 16 2020 <jogas@lanl.gov> - @VERSION@-@RELEASE@
-- Add new charliecloud package.
+-* Thu Apr 16 2020 <jogas@lanl.gov> - @VERSION@-@RELEASE@
+-- Add new charliecloud package.
diff --git a/packaging/fedora/el7-pkgdir.patch b/packaging/fedora/el7-pkgdir.patch
@@ -1,11 +1,11 @@
---- charliecloud-0.32/bin/ch-test    2023-03-22 17:36:46.000000000 -0400
-+++ charliecloud-0.32.patch/bin/ch-test    2023-04-03 10:51:53.677205658 -0400
-@@ -767,7 +767,7 @@
+--- a/bin/ch-test	2024-01-19 13:17:53.000000000 -0500
++++ b/bin/ch-test	2024-02-09 14:37:15.388753491 -0500
+@@ -779,7 +779,7 @@
+
+ # Find test directories. Note some of this gets rewritten at install time.
+ CHTEST_DIR=${ch_base}/test
+-CHTEST_EXAMPLES_DIR=${ch_base}/examples
++CHTEST_EXAMPLES_DIR=${ch_base}-${ch_version}/examples
+ if [[ ! -f ${ch_base}/VERSION ]]; then
+     # installed
      CHTEST_INSTALLED=yes
-     CHTEST_GITWD=
-     CHTEST_DIR=${ch_base}/libexec/charliecloud/test
--    CHTEST_EXAMPLES_DIR=${ch_base}/share/doc/charliecloud/examples
-+    CHTEST_EXAMPLES_DIR=${ch_base}/share/doc/charliecloud-${ch_version}/examples
- else
-     # build dir
-     CHTEST_INSTALLED=
diff --git a/packaging/fedora/no-rpath.patch → packaging/fedora/no-squashfuse-rpath.patch b/packaging/fedora/no-rpath.patch → packaging/fedora/no-squashfuse-rpath.patch
@@ -1,11 +1,11 @@
---- charliecloud-0.32/configure    2023-03-24 18:49:49.000000000 -0400
-+++ charliecloud-0.32.patch/configure    2023-04-03 09:55:31.756259159 -0400
-@@ -5880,7 +5880,7 @@
- else
+--- a/configure	2024-02-09 11:26:45.647046362 -0500
++++ b/configure	2024-02-09 11:30:18.613833446 -0500
+@@ -7137,7 +7137,7 @@
+ else $as_nop
    rpath_libsquashfuse=
  fi
 -       CH_RUN_LIBS="-lsquashfuse_ll -lfuse3 $rpath_libsquashfuse $CH_RUN_LIBS"
 +       CH_RUN_LIBS="-lsquashfuse_ll -lfuse3 $CH_RUN_LIBS"
- else
+ else $as_nop
    have_libsquashfuse=no
  fi
diff --git a/packaging/fedora/upstream.spec b/packaging/fedora/upstream.spec
@@ -10,19 +10,18 @@
 %{?el7:%global __python %__python3}
 
 Name:          charliecloud
-Version:       0.32
+Version:       0.36
 Release:       2%{?dist}
 Summary:       Lightweight user-defined software stacks for high-performance computing
 License:       ASL 2.0
 URL:           https://hpc.github.io/%{name}/
 Source0:       https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires: gcc rsync bash
-Requires:      squashfuse squashfs-tools findutils
+BuildRequires: gcc rsync bash findutils
 Patch0:        el7-pkgdir.patch
 %if 0%{?fedora} > 36 || 0%{?rhel} > 8
-BuildRequires: fuse3 fuse3-libs fuse3-devel squashfuse-devel
-Requires:      fuse3-libs squashfuse
-Patch1:        no-rpath.patch
+Requires:      fuse3 squashfuse
+BuildRequires: fuse3-libs fuse3-devel squashfuse-devel
+Patch1:        no-squashfuse-rpath.patch
 %endif
 
 %description
@@ -44,13 +43,11 @@ BuildRequires: python%{python3_pkgversion}-requests
 Requires:      %{name}
 Requires:      python3
 Requires:      python%{python3_pkgversion}-requests
-Provides:      bundled(python%{python3_pkgversion}-lark-parser) = 0.11.3
-%if 0%{?fedora} > 34 || 0%{?rhel} > 8
-Requires:        git >= 2.28.1
+%if 1%{?el7}
+Requires:      git >= 2.28.1
 %endif
+Provides:      bundled(python%{python3_pkgversion}-lark-parser) = 1.1.9
 %{?el7:BuildArch: noarch}
-%{?el8:Requires: git >= 2.28.1}
-%{?el9:Requires: git >= 2.28.1}
 
 %description builder
 This package provides ch-image, Charliecloud's completely unprivileged container
@@ -95,6 +92,9 @@ CFLAGS=${CFLAGS:-%optflags -fgnu89-inline}; export CFLAGS
 %configure --docdir=%{_pkgdocdir} \
            --libdir=%{_prefix}/lib \
            --with-python=/usr/bin/python3 \
+%if 0%{?fedora} > 34 || 0%{?rhel} > 8
+           --with-libsquashfusei=/usr \
+%endif
 %if 0%{?el7}
            --with-sphinx-build=%{_bindir}/sphinx-build-3.6
 %else
@@ -163,8 +163,7 @@ ln -s "${sphinxdir}/js"    %{buildroot}%{_pkgdocdir}/html/_static/js
 %{_prefix}/lib/%{name}/force.py
 %{_prefix}/lib/%{name}/image.py
 %{_prefix}/lib/%{name}/lark
-%{_prefix}/lib/%{name}/lark-1.1.8.dist-info
-%{_prefix}/lib/%{name}/lark-stubs
+%{_prefix}/lib/%{name}/lark-1.1.9.dist-info
 %{_prefix}/lib/%{name}/misc.py
 %{_prefix}/lib/%{name}/pull.py
 %{_prefix}/lib/%{name}/push.py
@@ -180,10 +179,25 @@ ln -s "${sphinxdir}/js"    %{buildroot}%{_pkgdocdir}/html/_static/js
 
 %files test
 %{_bindir}/ch-test
-%{_libexecdir}/%{name}/test
+%{_libexecdir}/%{name}
 %{_mandir}/man1/ch-test.1*
 
 %changelog
+* Fri Feb 09 2024 Jordan Ogas <jogas@lanl.gov> - 0.36-2
+- fix epel7 patch
+
+* Fri Feb 09 2024 Jordan Ogas <jogas@lanl.gov> - 0.36-1
+- new version 0.36
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Mon Apr 03 2023 Jordan Ogas <jogas@lanl.gov> 0.32-2
 - fix macro conditionals
 
@@ -385,4 +399,3 @@ ln -s "${sphinxdir}/js"    %{buildroot}%{_pkgdocdir}/html/_static/js
 
 * Thu Mar 14 2019  <jogas@lanl.gov> 0.9.8-1
 - Add initial Fedora/EPEL package
-