Skip to content

Commit d3434eb

Browse files
committed
pkg: Update to latest grass.spec from Fedora (#6880)
Sync to the latest `grass.spec` from Fedora Git repo (<https://src.fedoraproject.org/rpms/grass>).
1 parent 0f29ac8 commit d3434eb

File tree

1 file changed

+151
-65
lines changed

1 file changed

+151
-65
lines changed

rpm/grass.spec

Lines changed: 151 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
%global shortver 83
1+
%global shortver 84
22
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
33

44
Name: grass
5-
Version: 8.3.0
6-
Release: 3%{?dist}
5+
Version: 8.4.2
6+
Release: 4%{?dist}
77
Summary: GRASS GIS - Geographic Resources Analysis Support System
88

99
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
@@ -31,98 +31,91 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta
3131
# fix pkgconfig file
3232
Patch 0: grass-pkgconfig.patch
3333

34+
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
35+
ExcludeArch: %{ix86}
36+
3437
BuildRequires: bison
3538
%if %{with flexiblas}
3639
BuildRequires: flexiblas-devel
3740
%else
3841
BuildRequires: blas-devel, lapack-devel
3942
%endif
43+
BuildRequires: bzip2-devel
4044
BuildRequires: cairo-devel
41-
BuildRequires: gcc-c++
4245
BuildRequires: desktop-file-utils
4346
BuildRequires: fftw-devel
4447
BuildRequires: flex
4548
BuildRequires: freetype-devel
49+
BuildRequires: gcc-c++
4650
BuildRequires: gdal-devel
4751
BuildRequires: geos-devel
4852
BuildRequires: gettext
4953
BuildRequires: laszip-devel
5054
BuildRequires: libappstream-glib
5155
BuildRequires: libpng-devel
56+
%if 0%{?rhel} && 0%{?rhel} == 7
57+
BuildRequires: postgresql-devel
58+
%else
59+
BuildRequires: libpq-devel
60+
%endif
5261
BuildRequires: libtiff-devel
5362
BuildRequires: libXmu-devel
63+
BuildRequires: libzstd-devel
64+
BuildRequires: make
65+
BuildRequires: mariadb-connector-c-devel openssl-devel
5466
BuildRequires: mesa-libGL-devel
5567
BuildRequires: mesa-libGLU-devel
56-
%if (0%{?rhel} > 7 || 0%{?fedora})
57-
BuildRequires: mariadb-connector-c-devel openssl-devel
58-
%else
59-
BuildRequires: mysql-devel
60-
%endif
6168
BuildRequires: netcdf-devel
69+
BuildRequires: PDAL
70+
BuildRequires: PDAL-devel
71+
BuildRequires: PDAL-libs
72+
BuildRequires: proj-devel
6273
BuildRequires: python3
6374
%if 0%{?rhel} == 7
6475
# EPEL7
65-
BuildRequires: python%{python3_version_nodots}-numpy
66-
%else
67-
BuildRequires: python3-numpy
68-
%endif
69-
%if 0%{?rhel} && 0%{?rhel} == 7
70-
BuildRequires: postgresql-devel
76+
BuildRequires: python%{python3_version_nodots}-dateutil
7177
%else
72-
BuildRequires: libpq-devel
78+
BuildRequires: python3-dateutil
7379
%endif
74-
BuildRequires: proj-devel
80+
BuildRequires: python3-devel
7581
%if 0%{?rhel} == 7
7682
# EPEL7
77-
BuildRequires: python%{python3_version_nodots}-dateutil
83+
BuildRequires: python%{python3_version_nodots}-numpy
7884
%else
79-
BuildRequires: python3-dateutil
85+
BuildRequires: python3-numpy
8086
%endif
81-
BuildRequires: python3-devel
8287
BuildRequires: python3-pillow
83-
BuildRequires: PDAL
84-
BuildRequires: PDAL-libs
85-
BuildRequires: PDAL-devel
8688
BuildRequires: readline-devel
8789
BuildRequires: sqlite-devel
8890
BuildRequires: subversion
8991
BuildRequires: unixODBC-devel
9092
BuildRequires: zlib-devel
91-
BuildRequires: bzip2-devel
92-
BuildRequires: libzstd-devel
93-
BuildRequires: make
9493

9594
Requires: bzip2-libs
96-
Requires: libzstd
9795
Requires: geos
98-
# fedora >= 34: Nothing
99-
%if (0%{?rhel} > 7 || 0%{?fedora} < 34)
100-
Requires: proj-datumgrid
101-
Requires: proj-datumgrid-world
102-
%endif
96+
Requires: libzstd
97+
Requires: PDAL
98+
Requires: PDAL-libs
10399
Requires: python3
104100
%if 0%{?rhel} == 7
105101
# EPEL7
106-
Requires: python%{python3_version_nodots}-numpy
102+
Requires: python%{python3_version_nodots}-dateutil
107103
%else
108-
Requires: python3-numpy
104+
Requires: python3-dateutil
109105
%endif
110106
%if 0%{?rhel} == 7
111107
# EPEL7
112-
Requires: python%{python3_version_nodots}-dateutil
108+
Requires: python%{python3_version_nodots}-numpy
113109
%else
114-
Requires: python3-dateutil
110+
Requires: python3-numpy
115111
%endif
116112
Requires: python3-wxpython4
117-
Requires: PDAL
118-
Requires: PDAL-libs
119113

120114
%if "%{_lib}" == "lib"
121115
%global cpuarch 32
122116
%else
123117
%global cpuarch 64
124118
%endif
125-
126119
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
127120

128121
%description
@@ -170,47 +163,50 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
170163
%build
171164
%configure \
172165
--prefix=%{_libdir} \
173-
--with-cxx \
174-
--with-tiff \
175-
--with-png \
176-
--with-postgres \
177-
%if 0%{?rhel} > 7
178-
--with-mysql=no \
179-
%else
180-
--with-mysql \
181-
%endif
182-
--with-opengl \
183-
--with-odbc \
184-
--with-fftw \
185166
--with-blas \
186-
--with-lapack \
187167
%if %{with flexiblas}
188168
--with-blas-includes=%{_includedir}/flexiblas \
189-
--with-lapack-includes=%{_includedir}/flexiblas \
190169
%endif
170+
--with-bzlib \
191171
--with-cairo \
172+
--with-cairo-ldflags=-lfontconfig \
173+
--with-cxx \
174+
--with-fftw \
192175
--with-freetype \
193-
--with-nls \
194-
--with-pdal \
195-
--with-readline \
196-
--with-regex \
197-
--with-openmp \
176+
--with-freetype-includes=%{_includedir}/freetype2 \
198177
--with-gdal=%{_bindir}/gdal-config \
199-
--with-wxwidgets=%{_bindir}/wx-config \
200178
--with-geos=%{_bindir}/geos-config \
201-
--with-netcdf=%{_bindir}/nc-config \
179+
--with-lapack \
180+
%if %{with flexiblas}
181+
--with-lapack-includes=%{_includedir}/flexiblas \
182+
%endif
183+
%if 0%{?rhel} > 7
184+
--with-mysql=no \
185+
%else
186+
--with-mysql \
187+
%endif
202188
--with-mysql-includes=%{_includedir}/mysql \
203189
%if (0%{?fedora} >= 27)
204190
--with-mysql-libs=%{_libdir} \
205191
%else
206192
--with-mysql-libs=%{_libdir}/mysql \
207193
%endif
194+
--with-netcdf=%{_bindir}/nc-config \
195+
--with-nls \
196+
--with-odbc \
197+
--with-opengl \
198+
--with-openmp \
199+
--with-pdal \
200+
--with-png \
201+
--with-postgres \
208202
--with-postgres-includes=%{_includedir}/pgsql \
209-
--with-cairo-ldflags=-lfontconfig \
210-
--with-freetype-includes=%{_includedir}/freetype2 \
211-
--with-bzlib \
212-
--with-zstd \
213-
--with-proj-share=%{_datadir}/proj
203+
--with-proj-share=%{_datadir}/proj \
204+
--with-readline \
205+
--with-regex \
206+
--with-tiff \
207+
--with-wxwidgets=%{_bindir}/wx-config \
208+
--with-zstd
209+
214210

215211
# .package_note hack for RHBZ #2084342 and RHBZ #2102895
216212
sed -i "s+ -Wl,-dT,${RPM_BUILD_DIR}/grass-%{version}/.package_note-grass-%{version}-%{release}.%{_arch}.ld++g" include/Make/Platform.make
@@ -338,6 +334,96 @@ fi
338334
%{_libdir}/%{name}%{shortver}/include
339335

340336
%changelog
337+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.2-4
338+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
339+
340+
* Wed Jan 14 2026 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 8.4.2-3
341+
- Drop support for i686
342+
343+
* Sun Nov 23 2025 Sandro Mani <manisandro@gmail.com> - 8.4.2-2
344+
- Rebuild (gdal)
345+
346+
* Sun Nov 23 2025 Markus Neteler <neteler@mundialis.de> - 8.4.2-1
347+
- Update to GRASS 8.4.2 (#2416357)
348+
349+
* Sat Sep 27 2025 Markus Neteler <neteler@mundialis.de> - 8.4.1-8
350+
- Rebuilt for F43
351+
352+
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 8.4.1-7
353+
- Rebuilt for Python 3.14.0rc3 bytecode
354+
355+
* Fri Aug 22 2025 Orion Poplawski <orion@nwra.com> - 8.4.1-6
356+
- Rebuild for netcdf 4.9.3 soname bump
357+
358+
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 8.4.1-5
359+
- Rebuilt for Python 3.14.0rc2 bytecode
360+
361+
* Sun Aug 03 2025 Sandro Mani <manisandro@gmail.com> - 8.4.1-4
362+
- Rebuild (PDAL)
363+
364+
* Wed Jul 30 2025 Sandro Mani <manisandro@gmail.com> - 8.4.1-3
365+
- Rebuild (gdal)
366+
367+
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.1-2
368+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
369+
370+
* Mon Feb 24 2025 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.4.1-1
371+
- Update to 8.4.1 (#2347356)
372+
373+
* Sat Feb 22 2025 Markus Neteler <neteler@mundialis.de> - 8.4.0-7
374+
- drop outdated proj-datumgrid condition
375+
376+
* Mon Feb 10 2025 Markus Neteler <neteler@mundialis.de> - 8.4.0-6
377+
- EPEL10: fix proj-datumgrid condition
378+
379+
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-5
380+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
381+
382+
* Sat Nov 09 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-4
383+
- Rebuild (gdal)
384+
385+
* Sat Oct 26 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-3
386+
- Sort requirements and flags (https://github.com/OSGeo/grass/pull/4563/ by Edouard Choinière)
387+
388+
* Fri Sep 06 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-2
389+
- Rebuild (PDAL)
390+
391+
* Sun Jul 28 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-1
392+
- Update to 8.4.0
393+
394+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.2-4
395+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
396+
397+
* Tue May 14 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-3
398+
- Rebuild (gdal)
399+
400+
* Tue Mar 19 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-2
401+
- Rebuild (PDAL)
402+
403+
* Thu Mar 07 2024 Markus Neteler <neteler@mundialis.de> - 8.3.2-1
404+
- Update to 8.3.2 (#2268514)
405+
406+
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-6
407+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
408+
409+
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-5
410+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
411+
412+
* Wed Jan 3 2024 Florian Weimer <fweimer@redhat.com> - 8.3.1-4
413+
- Fix C compatibility issue in MySQL port handling
414+
415+
* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 8.3.1-3
416+
- Rebuild (gdal)
417+
418+
* Sat Oct 28 2023 Markus Neteler <neteler@mundialis.de> 8.3.1-2
419+
- fix obsolete configure parameters
420+
421+
* Thu Oct 26 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.3.1-1
422+
- Update to GRASS GIS 8.3.1 (#2246359)
423+
424+
* Sat Oct 14 2023 Sandro Mani <manisandro@gmail.com> - 8.3.0-4
425+
- Rebuild (PDAL)
426+
341427
* Sun Aug 06 2023 Alexandre Detiste <alexandre.detiste@gmail.com> - 8.3.0-3
342428
- Remove support for RHEL6: Grass is now Python3 only
343429

0 commit comments

Comments
 (0)