Skip to content
This repository was archived by the owner on Oct 2, 2024. It is now read-only.

Commit b0c2651

Browse files
j-ogasj-ogas
committed
update to 0.36
1 parent 524059d commit b0c2651

File tree

4 files changed

+57
-46
lines changed

4 files changed

+57
-46
lines changed

‎packaging/fedora/charliecloud.spec

+14-16
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ Summary: Lightweight user-defined software stacks for high-performance com
1616
License: ASL 2.0
1717
URL: https://hpc.github.io/%{name}/
1818
Source0: https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
19-
BuildRequires: gcc rsync bash
20-
Requires: squashfuse squashfs-tools findutils
19+
BuildRequires: gcc rsync bash findutils
2120
Patch0: el7-pkgdir.patch
22-
%if 0%{?fedora} > 36
23-
BuildRequires: fuse3 fuse3-libs fuse3-devel squashfuse-devel
24-
Requires: fuse3-libs squashfuse
25-
Patch1: no-rpath.patch
21+
%if 0%{?fedora} > 36 || 0%{?rhel} > 8
22+
Requires: fuse3 squashfuse
23+
BuildRequires: fuse3-libs fuse3-devel squashfuse-devel
24+
Patch1: no-squashfuse-rpath.patch
2625
%endif
2726

2827
%description
@@ -39,18 +38,16 @@ For more information: https://hpc.github.io/charliecloud
3938
%package builder
4039
Summary: Charliecloud container image building tools
4140
License: ASL 2.0 and MIT
42-
BuildArch: noarch
4341
BuildRequires: python3-devel
4442
BuildRequires: python%{python3_pkgversion}-requests
4543
Requires: %{name}
4644
Requires: python3
4745
Requires: python%{python3_pkgversion}-requests
48-
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 0.11.3
49-
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
50-
Requires: git >= 2.28.1
46+
%if 1%{?el7}
47+
Requires: git >= 2.28.1
5148
%endif
52-
%{?el8:Requires: git >= 2.28.1}
53-
%{?el9:Requires: git >= 2.28.1}
49+
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 1.1.9
50+
%{?el7:BuildArch: noarch}
5451

5552
%description builder
5653
This package provides ch-image, Charliecloud's completely unprivileged container
@@ -81,12 +78,10 @@ Test fixtures for %{name}.
8178
%setup -q
8279

8380
%if 0%{?el7}
84-
# el7 mock builds use "%patchN".
8581
%patch0 -p1
8682
%endif
8783

8884
%if 0%{?fedora} > 36
89-
# fedora/rhel use "%patch N".
9085
%patch 1 -p1
9186
%endif
9287

@@ -97,6 +92,9 @@ CFLAGS=${CFLAGS:-%optflags -fgnu89-inline}; export CFLAGS
9792
%configure --docdir=%{_pkgdocdir} \
9893
--libdir=%{_prefix}/lib \
9994
--with-python=/usr/bin/python3 \
95+
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
96+
--with-libsquashfusei=/usr \
97+
%endif
10098
%if 0%{?el7}
10199
--with-sphinx-build=%{_bindir}/sphinx-build-3.6
102100
%else
@@ -185,5 +183,5 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
185183
%{_mandir}/man1/ch-test.1*
186184

187185
%changelog
188-
* Thu Apr 16 2020 <[email protected]> - @VERSION@-@RELEASE@
189-
- Add new charliecloud package.
186+
-* Thu Apr 16 2020 <[email protected]> - @VERSION@-@RELEASE@
187+
-- Add new charliecloud package.

‎packaging/fedora/el7-pkgdir.patch

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
--- charliecloud-0.32/bin/ch-test 2023-03-22 17:36:46.000000000 -0400
2-
+++ charliecloud-0.32.patch/bin/ch-test 2023-04-03 10:51:53.677205658 -0400
3-
@@ -767,7 +767,7 @@
1+
--- a/bin/ch-test 2024-01-19 13:17:53.000000000 -0500
2+
+++ b/bin/ch-test 2024-02-09 14:37:15.388753491 -0500
3+
@@ -779,7 +779,7 @@
4+
5+
# Find test directories. Note some of this gets rewritten at install time.
6+
CHTEST_DIR=${ch_base}/test
7+
-CHTEST_EXAMPLES_DIR=${ch_base}/examples
8+
+CHTEST_EXAMPLES_DIR=${ch_base}-${ch_version}/examples
9+
if [[ ! -f ${ch_base}/VERSION ]]; then
10+
# installed
411
CHTEST_INSTALLED=yes
5-
CHTEST_GITWD=
6-
CHTEST_DIR=${ch_base}/libexec/charliecloud/test
7-
- CHTEST_EXAMPLES_DIR=${ch_base}/share/doc/charliecloud/examples
8-
+ CHTEST_EXAMPLES_DIR=${ch_base}/share/doc/charliecloud-${ch_version}/examples
9-
else
10-
# build dir
11-
CHTEST_INSTALLED=

‎packaging/fedora/no-rpath.patch ‎packaging/fedora/no-squashfuse-rpath.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
--- charliecloud-0.32/configure 2023-03-24 18:49:49.000000000 -0400
2-
+++ charliecloud-0.32.patch/configure 2023-04-03 09:55:31.756259159 -0400
3-
@@ -5880,7 +5880,7 @@
4-
else
1+
--- a/configure 2024-02-09 11:26:45.647046362 -0500
2+
+++ b/configure 2024-02-09 11:30:18.613833446 -0500
3+
@@ -7137,7 +7137,7 @@
4+
else $as_nop
55
rpath_libsquashfuse=
66
fi
77
- CH_RUN_LIBS="-lsquashfuse_ll -lfuse3 $rpath_libsquashfuse $CH_RUN_LIBS"
88
+ CH_RUN_LIBS="-lsquashfuse_ll -lfuse3 $CH_RUN_LIBS"
9-
else
9+
else $as_nop
1010
have_libsquashfuse=no
1111
fi

‎packaging/fedora/upstream.spec

+28-15
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,18 @@
1010
%{?el7:%global __python %__python3}
1111

1212
Name: charliecloud
13-
Version: 0.32
13+
Version: 0.36
1414
Release: 2%{?dist}
1515
Summary: Lightweight user-defined software stacks for high-performance computing
1616
License: ASL 2.0
1717
URL: https://hpc.github.io/%{name}/
1818
Source0: https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
19-
BuildRequires: gcc rsync bash
20-
Requires: squashfuse squashfs-tools findutils
19+
BuildRequires: gcc rsync bash findutils
2120
Patch0: el7-pkgdir.patch
2221
%if 0%{?fedora} > 36 || 0%{?rhel} > 8
23-
BuildRequires: fuse3 fuse3-libs fuse3-devel squashfuse-devel
24-
Requires: fuse3-libs squashfuse
25-
Patch1: no-rpath.patch
22+
Requires: fuse3 squashfuse
23+
BuildRequires: fuse3-libs fuse3-devel squashfuse-devel
24+
Patch1: no-squashfuse-rpath.patch
2625
%endif
2726

2827
%description
@@ -44,13 +43,11 @@ BuildRequires: python%{python3_pkgversion}-requests
4443
Requires: %{name}
4544
Requires: python3
4645
Requires: python%{python3_pkgversion}-requests
47-
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 0.11.3
48-
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
49-
Requires: git >= 2.28.1
46+
%if 1%{?el7}
47+
Requires: git >= 2.28.1
5048
%endif
49+
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 1.1.9
5150
%{?el7:BuildArch: noarch}
52-
%{?el8:Requires: git >= 2.28.1}
53-
%{?el9:Requires: git >= 2.28.1}
5451

5552
%description builder
5653
This package provides ch-image, Charliecloud's completely unprivileged container
@@ -95,6 +92,9 @@ CFLAGS=${CFLAGS:-%optflags -fgnu89-inline}; export CFLAGS
9592
%configure --docdir=%{_pkgdocdir} \
9693
--libdir=%{_prefix}/lib \
9794
--with-python=/usr/bin/python3 \
95+
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
96+
--with-libsquashfusei=/usr \
97+
%endif
9898
%if 0%{?el7}
9999
--with-sphinx-build=%{_bindir}/sphinx-build-3.6
100100
%else
@@ -163,8 +163,7 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
163163
%{_prefix}/lib/%{name}/force.py
164164
%{_prefix}/lib/%{name}/image.py
165165
%{_prefix}/lib/%{name}/lark
166-
%{_prefix}/lib/%{name}/lark-1.1.8.dist-info
167-
%{_prefix}/lib/%{name}/lark-stubs
166+
%{_prefix}/lib/%{name}/lark-1.1.9.dist-info
168167
%{_prefix}/lib/%{name}/misc.py
169168
%{_prefix}/lib/%{name}/pull.py
170169
%{_prefix}/lib/%{name}/push.py
@@ -180,10 +179,25 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
180179

181180
%files test
182181
%{_bindir}/ch-test
183-
%{_libexecdir}/%{name}/test
182+
%{_libexecdir}/%{name}
184183
%{_mandir}/man1/ch-test.1*
185184

186185
%changelog
186+
* Fri Feb 09 2024 Jordan Ogas <[email protected]> - 0.36-2
187+
- fix epel7 patch
188+
189+
* Fri Feb 09 2024 Jordan Ogas <[email protected]> - 0.36-1
190+
- new version 0.36
191+
192+
* Tue Jan 23 2024 Fedora Release Engineering <[email protected]> - 0.32-5
193+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
194+
195+
* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 0.32-4
196+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
197+
198+
* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 0.32-3
199+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
200+
187201
* Mon Apr 03 2023 Jordan Ogas <[email protected]> 0.32-2
188202
- fix macro conditionals
189203

@@ -385,4 +399,3 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
385399

386400
* Thu Mar 14 2019 <[email protected]> 0.9.8-1
387401
- Add initial Fedora/EPEL package
388-

0 commit comments

Comments
 (0)