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

Commit eeec0b8

Browse files
j-ogasj-ogas
committed
add upstream diff to show differences
1 parent 00a9cbc commit eeec0b8

File tree

1 file changed

+303
-0
lines changed

1 file changed

+303
-0
lines changed

‎packaging/fedora/upstream.diff

+303
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,303 @@
1+
--- charliecloud.spec 2024-02-09 17:33:04.983698614 -0700
2+
+++ upstream.spec 2024-02-09 14:32:41.000000000 -0700
3+
@@ -10,16 +10,14 @@
4+
%{?el7:%global __python %__python3}
5+
6+
Name: charliecloud
7+
-Version: @VERSION@
8+
-Release: @RELEASE@%{?dist}
9+
+Version: 0.36
10+
+Release: 2%{?dist}
11+
Summary: Lightweight user-defined software stacks for high-performance computing
12+
License: ASL 2.0
13+
URL: https://hpc.github.io/%{name}/
14+
Source0: https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
15+
BuildRequires: gcc rsync bash findutils
16+
-%if 0%{?el7}
17+
Patch0: el7-pkgdir.patch
18+
-%endif
19+
%if 0%{?fedora} > 36 || 0%{?rhel} > 8
20+
Requires: fuse3 squashfuse
21+
BuildRequires: fuse3-libs fuse3-devel squashfuse-devel
22+
@@ -45,13 +43,11 @@
23+
Requires: %{name}
24+
Requires: python3
25+
Requires: python%{python3_pkgversion}-requests
26+
-# For some reason this expressio is not respected in centos_7ch; thus, we
27+
-# just specify any git.
28+
%if 1%{?el7}
29+
-Requires: git
30+
-#Requires: git >= 2.28.1
31+
+Requires: git >= 2.28.1
32+
%endif
33+
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 1.1.9
34+
+%{?el7:BuildArch: noarch}
35+
36+
%description builder
37+
This package provides ch-image, Charliecloud's completely unprivileged container
38+
@@ -69,16 +65,14 @@
39+
%description doc
40+
Html and man page documentation for %{name}.
41+
42+
-%if 1%{?el7}
43+
%package test
44+
Summary: Charliecloud test suite
45+
License: ASL 2.0
46+
-Requires: %{name} %{name}-builder bats
47+
+Requires: %{name} %{name}-builder /usr/bin/bats
48+
Obsoletes: %{name}-test < %{version}-%{release}
49+
50+
%description test
51+
Test fixtures for %{name}.
52+
-%endif
53+
54+
%prep
55+
%setup -q
56+
@@ -87,7 +81,7 @@
57+
%patch0 -p1
58+
%endif
59+
60+
-%if 0%{?fedora} > 36 || 0%{?rhel} > 8
61+
+%if 0%{?fedora} > 36
62+
%patch 1 -p1
63+
%endif
64+
65+
@@ -98,7 +92,7 @@
66+
%configure --docdir=%{_pkgdocdir} \
67+
--libdir=%{_prefix}/lib \
68+
--with-python=/usr/bin/python3 \
69+
-%if 0%{?fedora} > 34 || 0%{?rhel} > 7
70+
+%if 0%{?fedora} > 34 || 0%{?rhel} > 8
71+
--with-libsquashfusei=/usr \
72+
%endif
73+
%if 0%{?el7}
74+
@@ -183,13 +177,225 @@
75+
%{_pkgdocdir}/html
76+
%{?el7:%exclude %{_pkgdocdir}/examples/*/__pycache__}
77+
78+
-%if 1%{?el7}
79+
%files test
80+
%{_bindir}/ch-test
81+
%{_libexecdir}/%{name}
82+
%{_mandir}/man1/ch-test.1*
83+
-%endif
84+
85+
%changelog
86+
-* Thu Apr 16 2020 <[email protected]> - @VERSION@-@RELEASE@
87+
-- Add new charliecloud package.
88+
+* Fri Feb 09 2024 Jordan Ogas <[email protected]> - 0.36-2
89+
+- fix epel7 patch
90+
+
91+
+* Fri Feb 09 2024 Jordan Ogas <[email protected]> - 0.36-1
92+
+- new version 0.36
93+
+
94+
+* Tue Jan 23 2024 Fedora Release Engineering <[email protected]> - 0.32-5
95+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
96+
+
97+
+* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 0.32-4
98+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
99+
+
100+
+* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 0.32-3
101+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
102+
+
103+
+* Mon Apr 03 2023 Jordan Ogas <[email protected]> 0.32-2
104+
+- fix macro conditionals
105+
+
106+
+* Fri Mar 31 2023 Jordan Ogas <[email protected]> 0.32-1
107+
+- edit el7 patch: update ch-test path
108+
+- add patch: prevent rpath of standard path
109+
+- update builder package files
110+
+- add dependency: findutils
111+
+- add conditional dependencies: fuse3, squashfuse-devel, & git
112+
+- new version 0.32
113+
+
114+
+* Wed Jan 18 2023 Fedora Release Engineering <[email protected]> - 0.26-3
115+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
116+
+
117+
+* Wed Jul 20 2022 Fedora Release Engineering <[email protected]> - 0.26-2
118+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
119+
+
120+
+* Mon Jan 24 2022 Jordan Ogas <[email protected]> 0.26-1
121+
+- add printf patch for 32-bit
122+
+- add ch-convert script
123+
+- new version 0.26
124+
+
125+
+* Wed Jan 19 2022 Fedora Release Engineering <[email protected]> - 0.25-2
126+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
127+
+
128+
+* Mon Sep 20 2021 Jordan Ogas <[email protected]> 0.25-1
129+
+- bundle python lark parser
130+
+- new version
131+
+
132+
+* Thu Aug 05 2021 Jordan Ogas <[email protected]> 0.24-12
133+
+- remove version numbers from Obsolete
134+
+- remove Provides tag
135+
+- replace package name with macro
136+
+- tidy
137+
+
138+
+* Thu Jul 29 2021 Jordan Ogas <[email protected]> 0.24-11
139+
+- move -builder to noarch
140+
+- move examples back to -doc
141+
+- add versions to obsoletes
142+
+- use name macro
143+
+
144+
+* Wed Jul 28 2021 Jordan Ogas <[email protected]> 0.24-10
145+
+- fix yet another typo; BuildRequires
146+
+
147+
+* Wed Jul 28 2021 Jordan Ogas <[email protected]> 0.24-9
148+
+- add version to obsoletes
149+
+
150+
+* Wed Jul 28 2021 Jordan Ogas <[email protected]> 0.24-8
151+
+- fix provides typo
152+
+
153+
+* Wed Jul 28 2021 Jordan Ogas <[email protected]> 0.24-7
154+
+- add -common to obsoletes and provides
155+
+
156+
+* Wed Jul 28 2021 Jordan Ogas <[email protected]> - 0.24-6
157+
+* revert to meta-package; separate builder to -builder
158+
+
159+
+* Wed Jul 21 2021 Fedora Release Engineering <[email protected]> - 0.24-5
160+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
161+
+
162+
+* Mon Jul 19 2021 Jordan Ogas <[email protected]> - 0.24-4
163+
+- fix epel7 python cache files
164+
+
165+
+* Mon Jul 19 2021 Jordan Ogas <[email protected]> - 0.24-3
166+
+- Tidy, alphabatize files
167+
+- Move builder exlusive python files out from -common
168+
+- Move generic helper scripts to -common
169+
+- Add requires runtime to -builders
170+
+
171+
+* Tue Jul 13 2021 Dave Love <[email protected]> - 0.24-2
172+
+- Obsolete previous packge by -runtime, not -common
173+
+
174+
+* Wed Jun 30 2021 Dave Love <[email protected]> - 0.24-1
175+
+- New version
176+
+
177+
+* Sun Apr 18 2021 Dave Love <[email protected]> - 0.23-1
178+
+- New version
179+
+- Split main package into runtime, builder, and common sub-packages
180+
+- Require buildah and squashfs at run time
181+
+- Use /lib, not /lib64 for noarch; drop lib64 patch
182+
+- Don't BR squashfs-tools, squashfuse, buildah
183+
+- Require squashfs-tools in -builders
184+
+
185+
+* Mon Mar 8 2021 Dave Love <[email protected]> <[email protected]> - 0.22-2
186+
+- Fix source0 path
187+
+- Put man7 in base package
188+
+
189+
+* Tue Feb 9 2021 Dave Love <[email protected]> <[email protected]> - 0.22-1
190+
+- New version
191+
+- update lib64.patch
192+
+- add pull.py and push.py
193+
+- (Build)Require python3-lark-parser, python3-requests
194+
+
195+
+* Wed Feb 3 2021 <[email protected]> - 0.21-2
196+
+- Fix lib64.patch path for ch-image
197+
+
198+
+* Tue Jan 05 2021 <[email protected]> <[email protected]> - 0.21-1
199+
+- New version
200+
+- Ship charlicloud.7
201+
+- Require fakeroot
202+
+- Install fakeroot.py
203+
+- Always ship patch1
204+
+- Get python3_sitelib defined
205+
+- Move examples to -test and require sphinx_rtd_theme
206+
+- Include __pycache__ on el7
207+
+- Use %%python3_pkgversion
208+
+- BR python3, not /usr/bin/python3
209+
+- Fix comment capitalization and spacing
210+
+
211+
+* Tue Sep 22 2020 <[email protected]> - 0.19-1
212+
+- Package build.py and misc.py
213+
+- Remove unnecessary patch
214+
+- New release
215+
+
216+
+* Mon Jul 27 2020 Fedora Release Engineering <[email protected]> - 0.15-2
217+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
218+
+
219+
+* Thu Apr 16 2020 <[email protected]> - 0.15-1
220+
+- Add test suite package
221+
+- Update spec for autoconf
222+
+- New release
223+
+
224+
+* Tue Jan 28 2020 Fedora Release Engineering <[email protected]> - 0.10-2
225+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
226+
+
227+
+* Wed Sep 04 2019 <[email protected]> - 0.10-1
228+
+- Patch doc-src/conf.py for epel
229+
+- Fix doc-src/dev.rst
230+
+- Fix libexec and doc install path for 0.10 changes
231+
+- Tidy comments
232+
+- New release
233+
+
234+
+* Thu Aug 22 2019 <[email protected]> - 0.9.10-12
235+
+- Upate doc subpackage obsoletes
236+
+
237+
+* Mon Aug 19 2019 Dave love <[email protected]> - 0.9.10-11
238+
+- Use canonical form for Source0
239+
+- Remove main package dependency from doc, and make it noarch
240+
+
241+
+* Fri Aug 02 2019 <[email protected]> 0.9.10-10
242+
+- Tidy comments; fix typ
243+
+
244+
+* Thu Jul 25 2019 <[email protected]> 0.9.10-9
245+
+- Use python site variable; fix doc file reference
246+
+
247+
+* Tue Jul 23 2019 <[email protected]> 0.9.10-8
248+
+- Remove bundled js, css, and font bits
249+
+
250+
+* Mon Jul 22 2019 <[email protected] 0.9.10-7
251+
+- Fix prep section to handle warnings
252+
+- Move documentation dependencies to doc package
253+
+
254+
+* Fri Jul 19 2019 <[email protected]> 0.9.10-6
255+
+- Temporarily remove test suite
256+
+
257+
+* Wed Jul 10 2019 <[email protected]> 0.9.10-5
258+
+- Revert test and example install path change
259+
+- Update test readme
260+
+
261+
+* Wed Jul 3 2019 <[email protected]> 0.9.10-4
262+
+- Add doc package
263+
+
264+
+* Tue Jul 2 2019 <[email protected]> 0.9.10-3
265+
+- Tidy comments
266+
+- Update source URL
267+
+- Build html documentation; add rsync dependency
268+
+- Add el7 conditionals for documentation
269+
+- Remove libexecdir definition
270+
+- Add test suite README.TEST
271+
+
272+
+* Wed May 15 2019 <[email protected]> 0.9.10-2
273+
+- Fix comment typo
274+
+- Move test suite install path
275+
+
276+
+* Tue May 14 2019 <[email protected]> 0.9.10-1
277+
+- New version
278+
+- Fix README.EL7 sysctl command instruction
279+
+- Add pre-built html documentation
280+
+- Fix python dependency
281+
+- Remove temporary test-package readme
282+
+- Fixed capitalization of change log messages
283+
+
284+
+* Tue Apr 30 2019 <[email protected]> 0.9.9-4
285+
+- Move global python declaration
286+
+
287+
+* Mon Apr 29 2019 <[email protected]> 0.9.9-3
288+
+- Match bin files with wildcard
289+
+
290+
+* Mon Apr 29 2019 <[email protected]> 0.9.9-2
291+
+- Update macro comment
292+
+- Fix release tag history
293+
+
294+
+* Tue Apr 16 2019 <[email protected]> 0.9.9-1
295+
+- New version
296+
+- Move temp readme creation to install segment
297+
+- Fix spec file macro
298+
+
299+
+* Tue Apr 02 2019 <[email protected]> 0.9.8-2
300+
+- Remove python2 build option
301+
+
302+
+* Thu Mar 14 2019 <[email protected]> 0.9.8-1
303+
+- Add initial Fedora/EPEL package

0 commit comments

Comments
 (0)