From 0e4a3020e5adf72cdd80dda562a707c4e7cd8d66 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 10:04:37 -0800 Subject: [PATCH] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .gitignore | 15 - .rpmlint | 3 - dead.package | 1 + grass-7.8.0-buildroot.diff | 23 -- grass-config.h | 11 - grass-nourl.patch | 9 - grass.spec | 740 ------------------------------------- grass72_ctypes_gcc7.diff | 90 ----- grass72_rpc_removal.diff | 43 --- sources | 1 - 10 files changed, 1 insertion(+), 935 deletions(-) delete mode 100644 .gitignore delete mode 100644 .rpmlint create mode 100644 dead.package delete mode 100644 grass-7.8.0-buildroot.diff delete mode 100644 grass-config.h delete mode 100644 grass-nourl.patch delete mode 100644 grass.spec delete mode 100644 grass72_ctypes_gcc7.diff delete mode 100644 grass72_rpc_removal.diff delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3912d55..0000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -/grass-7.0.4.tar.gz -/grass-7.2.1.tar.gz -/grass-7.2.2.tar.gz -/grass-7.2.3.tar.gz -/grass-7.4.0.tar.gz -/grass-7.4.1.tar.gz -/grass-7.4.2.tar.gz -/grass-7.4.3.tar.gz -/grass-7.4.4.tar.gz -/grass-7.6.0.tar.gz -/grass-7.8.0.tar.gz -/grass-7.8.0-buildroot.patch -/grass-7.8.1.tar.gz -/grass-7.8.2.tar.gz -/grass-7.8.3.tar.gz diff --git a/.rpmlint b/.rpmlint deleted file mode 100644 index 1b2ff42..0000000 --- a/.rpmlint +++ /dev/null @@ -1,3 +0,0 @@ -from Config import * -addFilter("spelling-error .* (runtime|spatial)"); -addFilter("name-repeased-in-summary .* GRASS"); diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/grass-7.8.0-buildroot.diff b/grass-7.8.0-buildroot.diff deleted file mode 100644 index 6c29c54..0000000 --- a/grass-7.8.0-buildroot.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -up grass-7.8.0/include/Make/Install.make.sopwith grass-7.8.0/include/Make/Install.make ---- grass-7.8.0/include/Make/Install.make.sopwith 2019-09-13 15:07:19.127928851 -0400 -+++ grass-7.8.0/include/Make/Install.make 2019-09-13 15:25:55.583419717 -0400 -@@ -91,6 +91,10 @@ else - STARTUP = $(UNIX_BIN)/$(GRASS_NAME) - endif - -+ifndef GISBASE_RUNTIME -+GISBASE_RUNTIME=$(INST_DIR) -+endif -+ - FONTCAP = etc/fontcap - TMPGISRC = demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) - PLATMAKE = include/Make/Platform.make -@@ -125,7 +129,7 @@ $(INST_DIR) $(UNIX_BIN): - $(MAKE_DIR_CMD) $@ - - $(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp -- sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \ -+ sed -e 's#'@GISBASE@'#'$(GISBASE_RUNTIME)'#g' \ - -e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \ - -e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \ - $< > $@ diff --git a/grass-config.h b/grass-config.h deleted file mode 100644 index bc59573..0000000 --- a/grass-config.h +++ /dev/null @@ -1,11 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "grass/config-32.h" -#else -#if __WORDSIZE == 64 -#include "grass/config-64.h" -#else -#error "Unknown word size" -#endif -#endif diff --git a/grass-nourl.patch b/grass-nourl.patch deleted file mode 100644 index b6908aa..0000000 --- a/grass-nourl.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up grass-7.0.4/gui/icons/grass.desktop.nourl grass-7.0.4/gui/icons/grass.desktop ---- grass-7.0.4/gui/icons/grass.desktop.nourl 2016-01-11 16:03:21.000000000 -0700 -+++ grass-7.0.4/gui/icons/grass.desktop 2016-10-07 12:58:59.279554938 -0600 -@@ -51,5 +51,4 @@ Categories=Education;Science;Geoscience; - Exec=grass70 - Icon=grass70 - Terminal=true --URL=https://grass.osgeo.org/ - Keywords=gis;spatial;geospatial;database;remote sensing;hydrology;vector;raster;visualization;maps;wms;wfs;ogc;osgeo; diff --git a/grass.spec b/grass.spec deleted file mode 100644 index 684fc89..0000000 --- a/grass.spec +++ /dev/null @@ -1,740 +0,0 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - -%global shortver 78 -%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) - -Name: grass -Version: 7.8.3 -Release: 3%{?dist} -Summary: GRASS GIS - Geographic Resources Analysis Support System - -%if 0%{?rhel} >= 7 -%define __python %{__python3} -%global python3_version_nodots 36 -%global main_python3 1 -%endif - -# Note that the bcond macros are named for the CLI option they create. -# "%%bcond_without" means "ENABLE by default and create a --without option" -%bcond_without python3 - -License: GPLv2+ -URL: https://grass.osgeo.org -Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz -Source2: %{name}-config.h - -Patch1: grass-7.8.0-buildroot.diff - -BuildRequires: bison -BuildRequires: blas-devel -BuildRequires: cairo-devel -BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils -BuildRequires: fftw-devel -BuildRequires: flex -%if (0%{?rhel} > 6 || 0%{?fedora}) -BuildRequires: freetype-devel -%endif -BuildRequires: gdal-devel -BuildRequires: geos-devel -BuildRequires: gettext -BuildRequires: lapack-devel -%if (0%{?rhel} > 6 || 0%{?fedora}) -BuildRequires: libappstream-glib -%endif -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: libXmu-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%if (0%{?rhel} > 7 || 0%{?fedora}) -BuildRequires: mariadb-connector-c-devel openssl-devel -%else -BuildRequires: mysql-devel -%endif -%if (0%{?rhel} > 6 || 0%{?fedora}) -BuildRequires: netcdf-devel -%endif -BuildRequires: python3 -%if 0%{?rhel} == 7 -# EPEL7 -BuildRequires: python%{python3_version_nodots}-numpy -%else -BuildRequires: python3-numpy -%endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: postgresql-devel -%else -BuildRequires: libpq-devel -%endif -BuildRequires: proj-devel -%if (0%{?rhel} > 7 || 0%{?fedora} >= 30) -BuildRequires: proj-datumgrid -%else -BuildRequires: proj-epsg -BuildRequires: proj-nad -%endif -%if 0%{?fedora} >= 30 -BuildRequires: proj-datumgrid-world -%endif -%if (0%{?rhel} <= 6 && !0%{?fedora}) -# argparse is included in python2.7+ but not python2.6 -BuildRequires: python-argparse -%endif -%if 0%{?rhel} == 7 -# EPEL7 -BuildRequires: python%{python3_version_nodots}-dateutil -%else -BuildRequires: python3-dateutil -%endif -BuildRequires: python3-devel -%if (0%{?rhel} > 6 || 0%{?fedora}) -BuildRequires: python3-pillow -%else -# EPEL6 -BuildRequires: python-imaging -%endif -BuildRequires: readline-devel -BuildRequires: sqlite-devel -BuildRequires: subversion -BuildRequires: unixODBC-devel -BuildRequires: zlib-devel -BuildRequires: bzip2-devel -BuildRequires: libzstd-devel - -Requires: bzip2-libs -Requires: libzstd -Requires: geos -%if (0%{?rhel} > 7 || 0%{?fedora} >= 30) -Requires: proj-datumgrid -%else -Requires: proj-epsg -Requires: proj-nad -%endif -%if 0%{?fedora} >= 30 -Requires: proj-datumgrid-world -%endif -Requires: python3 -%if 0%{?rhel} == 7 -# EPEL7 -Requires: python%{python3_version_nodots}-numpy -%else -Requires: python3-numpy -%endif -%if 0%{?rhel} > 6 -# EPEL7/EPEL8 -#Requires: python3-matplotlib-wx -%else -Requires: python3-matplotlib -%endif -%if 0%{?rhel} == 7 -# EPEL7 -Requires: python%{python3_version_nodots}-dateutil -%else -Requires: python3-dateutil -%endif -%if 0%{?rhel} < 7 -Requires: wxPython -%else -%if 0%{?rhel} > 6 -# https://bugzilla.redhat.com/show_bug.cgi?id=1765573 -#Requires: python%{python3_version_nodots}-wxpython4 -%else -Requires: python3-wxpython4 -%endif -%endif - -%if "%{_lib}" == "lib" -%global cpuarch 32 -%else -%global cpuarch 64 -%endif - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description -GRASS (Geographic Resources Analysis Support System) is a Geographic -Information System (GIS) used for geospatial data management and -analysis, image processing, graphics/maps production, spatial -modeling, and visualization. GRASS is currently used in academic and -commercial settings around the world, as well as by many governmental -agencies and environmental consulting companies. - -%package libs -Summary: GRASS GIS runtime libraries - -%description libs -GRASS GIS runtime libraries - -%package gui -Summary: GRASS GIS GUI -Requires: %{name}%{?isa} = %{version}-%{release} - -%description gui -GRASS GIS GUI - -%package devel -Summary: GRASS GIS development headers -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -GRASS GIS development headers - -%prep -%setup -q - -%patch1 -p1 - -# Correct mysql_config query -sed -i -e 's/--libmysqld-libs/--libs/g' configure - -# Fixup shebangs -find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' - -%build -# Package is not ready for -Werror=format-security or the C++11 standard -CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')" -CXXFLAGS="-std=c++98 ${CFLAGS}" -%configure \ - --with-cxx \ - --with-tiff \ - --with-png \ - --with-postgres \ -%if 0%{?rhel} > 7 - --with-mysql=no \ -%else - --with-mysql \ -%endif - --with-opengl \ - --with-odbc \ - --with-fftw \ - --with-blas \ - --with-lapack \ - --with-cairo \ -%if (0%{?rhel} > 6 || 0%{?fedora}) - --with-freetype \ -%endif - --with-nls \ - --with-readline \ - --with-regex \ - --with-openmp \ - --with-gdal=%{_bindir}/gdal-config \ - --with-wxwidgets=%{_bindir}/wx-config \ - --with-geos=%{_bindir}/geos-config \ -%if (0%{?rhel} > 6 || 0%{?fedora}) - --with-netcdf=%{_bindir}/nc-config \ -%endif - --with-mysql-includes=%{_includedir}/mysql \ -%if (0%{?fedora} >= 27) - --with-mysql-libs=%{_libdir} \ -%else - --with-mysql-libs=%{_libdir}/mysql \ -%endif - --with-postgres-includes=%{_includedir}/pgsql \ - --with-cairo-ldflags=-lfontconfig \ - --with-freetype-includes=%{_includedir}/freetype2 \ - --with-bzlib \ - --with-zstd \ - --with-proj-share=%{_datadir}/proj - -make %{?_smp_mflags} - -# by default, grass will be installed to /usr/grass-%%{version} -# this is not FHS compliant: hide grass-%%{version} in %%{libdir} -%install -%make_install \ - DESTDIR=%{buildroot}%{_libdir} \ - prefix=%{buildroot}%{_libdir} \ - UNIX_BIN=%{buildroot}%{_bindir} \ - GISBASE_RUNTIME=%{_libdir}/%{name}%{shortver} - -# libraries and headers are in GISBASE = %%{_libdir}/%%{name} -# keep them in GISBASE - -# fix paths: -# Change GISBASE in startup script -for I in %{buildroot}%{_bindir}/%{name}%{shortver} \ - %{buildroot}%{_libdir}/%{name}%{shortver}/include/Make/Platform.make \ - %{buildroot}%{_libdir}/%{name}%{shortver}/include/Make/Grass.make \ - %{buildroot}%{_libdir}/%{name}%{shortver}/demolocation/.grassrc%{shortver} \ - %{buildroot}%{_libdir}/%{name}%{shortver}/etc/fontcap; do - sed -i \ - -e 's|%{buildroot}%{_libdir}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \ - -e 's|%{buildroot}%{_libdir}/%{name}%{shortver}|%{_libdir}/%{name}%{shortver}|g' \ - -e 's|%{buildroot}%{_bindir}|%{_bindir}|g' \ - $I -done - -# fix paths in grass.pc -sed -i -e 's|%{_prefix}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \ - %{name}.pc - -mkdir -p %{buildroot}%{_libdir}/pkgconfig -install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig - -# Create multilib header -mv %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h \ - %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config-%{cpuarch}.h -install -p -m 644 %{SOURCE2} %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h - -# Make man pages available on the system, convert to utf8 and avoid name conflict -mkdir -p %{buildroot}%{_mandir}/man1 -for man in $(ls %{buildroot}%{_libdir}/%{name}%{shortver}/docs/man/man1/*.1) -do - iconv -f iso8859-1 -t utf8 $man > %{buildroot}%{_mandir}/man1/$(basename $man)"%{name}" -done - -# create symlink to unversioned name -ln -s %{_bindir}/%{name}%{shortver} %{buildroot}%{_bindir}/%{name} - -# symlink docs from GISBASE to standard system location -mkdir -p %{buildroot}%{_docdir} -# append shortver to destination since man pages are unversioned -ln -s %{_libdir}/%{name}%{shortver}/docs %{buildroot}%{_docdir}/%{name}%{shortver} - -# Make desktop, appdata and icon files available on the system -mv %{buildroot}%{_libdir}/%{name}%{shortver}/share/* %{buildroot}%{_datadir} -desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.osgeo.%{name}.appdata.xml - -# Cleanup: nothing to do -#rm -rf %%{buildroot}%%{_prefix}/%%{name}-%%{version} - -# Finally move entire tree to shortver subdir -#mv %{buildroot}%{_libdir}/%{name}-%{version} %{buildroot}%{_libdir}/%{name}%{shortver} - -# rpm macro for version checking (not from buildroot!) -mkdir -p ${RPM_BUILD_ROOT}%{macrosdir} -cat > ${RPM_BUILD_ROOT}%{macrosdir}/macros.%{name} < %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf</dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%files -%exclude %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%exclude %{_libdir}/%{name}%{shortver}/driver/db/* -%exclude %{_libdir}/%{name}%{shortver}/lib -%exclude %{_libdir}/%{name}%{shortver}/include -%exclude %{_libdir}/%{name}%{shortver}/gui -%{_libdir}/%{name}%{shortver} -%{_bindir}/* -%{_datadir}/metainfo/* -%{_datadir}/applications/* -%{_datadir}/icons/hicolor/*/apps/* -%{_mandir}/man1/* -%{_docdir}/%{name}%{shortver} - -%files libs -%license AUTHORS COPYING GPL.TXT CHANGES -%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%{_libdir}/%{name}%{shortver}/lib/*.so -%{_libdir}/%{name}%{shortver}/lib/*.a -%dir %{_libdir}/%{name}%{shortver}/driver -%dir %{_libdir}/%{name}%{shortver}/driver/db -%{_libdir}/%{name}%{shortver}/driver/db/* - -%files gui -%{_libdir}/%{name}%{shortver}/gui - -%files devel -%doc TODO doc/* SUBMITTING -%{macrosdir}/macros.%{name} -%{_libdir}/pkgconfig/* -%dir %{_libdir}/%{name}%{shortver}/lib -%{_libdir}/%{name}%{shortver}/include - -%changelog -* Sat May 09 2020 Markus Neteler - 7.8.3-3 -- disabled mysql on EPEL8 due to header problem -- updated PROJ package names for EPEL8 - -* Wed May 06 2020 Markus Neteler - 7.8.3-2 -- enforce Python3 on EPEL7 -- do not hardcode python version on Fedora but use macro - -* Tue May 05 2020 Markus Neteler - 7.8.3 -- new upstream version GRASS GIS 7.8.3 - -* Tue Mar 03 2020 Sandro Mani - 7.8.2-3 -- Rebuild (gdal) - -* Wed Jan 29 2020 Fedora Release Engineering - 7.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Dec 12 2019 Markus Neteler - 7.8.2 -- new upstream version GRASS GIS 7.8.2 - -* Thu Oct 24 2019 Markus Neteler - 7.8.1 -- new upstream version GRASS GIS 7.8.1 -- it supports GDAL 3 and PROJ 6 - -* Thu Oct 24 2019 Markus Neteler - 7.8.0-5 -- fix EPEL7 support - -* Mon Sep 23 2019 Markus Metz - 7.8.0-4 -- enable bzip2 compression - -* Fri Sep 20 2019 Markus Neteler - 7.8.0-3 -- added missing proj-datumgrid and proj-datumgrid-world for >= F30 -- fix create symlink to unversioned name - -* Sat Sep 14 2019 Elliot C. Lee - 7.8.0-2 -- patch for upstream package and SPEC file - -* Fri Sep 13 2019 Markus Neteler - 7.8.0-1 -- new upstream version of GRASS GIS 7.8.0 -- dropped outdated liblas dependency - -* Wed Aug 14 2019 Markus Neteler - 7.8.0-RC1 -- test version of GRASS GIS 7.8.0RC1 with Python 3 support -- removal of no longer required Python 2/3 shebang update - -* Thu Jul 25 2019 Fedora Release Engineering - 7.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Mar 18 2019 Orion Poplawski - 7.6.0-5 -- Rebuild for netcdf 4.6.3 - -* Sun Feb 17 2019 Igor Gnatenko - 7.6.0-4 -- Rebuild for readline 8.0 - -* Mon Feb 04 2019 Devrim Gündüz - 7.6.0-3 -- Rebuild for new GeOS and Proj - -* Fri Feb 01 2019 Fedora Release Engineering - 7.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 17 2019 Markus Neteler - 7.6.0-1 -- new upstream version GRASS GIS 7.6.0 - -* Fri Jan 04 2019 Markus Neteler - 7.4.4-1 -- new upstream version GRASS GIS 7.4.4 - -* Tue Nov 27 2018 Markus Neteler - 7.4.3-1 -- new upstream version GRASS GIS 7.4.3 - -* Tue Nov 06 2018 Markus Neteler - 7.4.2-2 -- fix to include libgrass_*.so files in grass-libs.rpm - -* Sun Oct 28 2018 Markus Neteler - 7.4.2-1 -- new upstream version GRASS GIS 7.4.2 - -* Sun Sep 09 2018 Pavel Raiskup - 7.4.1-8 -- Clean up of PostgreSQL support (PR#4) - -* Tue Jul 31 2018 Florian Weimer - 7.4.1-7 -- Rebuild with fixed binutils - -* Sun Jul 29 2018 Markus Neteler - 7.4.1-6 -- added BuildRequires gcc-c++ to address RHBZ #1604262 due to RHBZ #1551327 (removing gcc and gcc-c++ from default buildroot) - -* Fri Jul 13 2018 Fedora Release Engineering - 7.4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jul 08 2018 Markus Neteler - 7.4.1-4 -- fix Python macro to explicitely use Python 2 interpreter - -* Sat Jul 07 2018 Scott Talbert - 7.4.1-3 -- Update BRs: remove wxGTK-devel and add cairo-devel - -* Sat Jun 23 2018 Markus Neteler - 7.4.1-2 -- fix wxPython package dependency name for CentOS7 - -* Tue Jun 12 2018 Markus Neteler - 7.4.1-1 -- new upstream version 7.4.1 -- do not fail on EPEL6 with appstream-util - -* Wed Apr 25 2018 Markus Neteler - 7.4.0-2 -- add /etc/ld.so.conf.d/grass-*.conf to find libs by Daniele Viganò (RHBZ #1571441) - -* Mon Apr 09 2018 Markus Neteler - 7.4.0-1 -- New upstream version 7.4.0 - -* Mon Mar 26 2018 Iryna Shcherbina - 7.2.3-2 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Mar 22 2018 Markus Neteler - 7.2.3-1 -- new upstream version 7.2.3 -- selected backport of major SPEC file cleanup from 7.4.0 done by Markus Metz -- Fix grass-devel which needs include/grass and include/Make dirs done by Markus Metz - 7.2.2-2 -- fix for EPEL in r.random.surface to avoid variable collision with GDAL -- SPEC cleanup with fix of dependencies between packages (review #1539116) -- appdata.xml file also go into '/usr/share/metainfo' -- use icon cache scriplets only on EPEL - -* Mon Jan 15 2018 Markus Metz - 7.2.2-1 -- Major cleanup of SPEC file -- Fix grass-devel which needs include/grass and include/Make dirs - -* Fri Jul 21 2017 Kalev Lember - 7.2.1-2 -- Rebuilt for Boost 1.64 - -* Wed May 3 2017 Markus Neteler - 7.2.1-1 -- New upstream version 7.2.1 - -* Thu Mar 2 2017 Markus Neteler - 7.2.0-3 -- Fix for g.extension which needs include/ dir in grass-devel - -* Sat Feb 4 2017 Markus Neteler - 7.2.0-2 -- Fixes for EPEL - -* Thu Jan 12 2017 Markus Neteler - 7.2.0-1 -- New upstream version 7.2.0 - -* Thu Jan 12 2017 Igor Gnatenko - 7.0.4-5 -- Rebuild for readline 7.x - -* Sun Jan 01 2017 Volker Froehlich - 7.0.4-4 -- Rebuild for libgeos - -* Fri Oct 7 2016 Orion Poplawski - 7.0.4-3 -- Add patch to fix desktop file -- Validate desktop and appdata files -- Fix script interpreters -- Convert files to UTF-8 if needed - -* Wed Sep 21 2016 Orion Poplawski - 7.0.4-2 -- Generate rpm macro file for version tracking - -* Mon May 9 2016 Devrim Gündüz - 7.0.4-1 -- Update to 7.0.4 - -* Mon Mar 07 2016 Thomas Kreuzer - 7.0.3-1 -- New SPEC file for GRASS GIS 7.0.3 - -* Tue Sep 23 2014 Richard Hughes - 6.4.4-5 -- Install the shipped AppData file - -* Sat Aug 16 2014 Fedora Release Engineering - 6.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Aug 09 2014 Ralf Corsépius 6.4.4-2 -- Rebase patches against grass-6.4.4. -- Convert -Werror=format-security into warnings (RHBZ#1106720). -- Minor spec cleanup. - -* Fri Jul 25 2014 Peter Robinson 6.4.4-1 -- Update to 6.4.4 -- Make 64bit conditionals generic - -* Sat Jun 07 2014 Fedora Release Engineering - 6.4.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Jaroslav Škarvada - 6.4.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Thu Mar 27 2014 Ville Skyttä - 6.4.3-6 -- Don't ship patch backup files - -* Mon Oct 14 2013 Volker Fröhlich - 6.4.3-5 -- Solve build failure on PPC tests (BZ#961838) - -* Wed Oct 9 2013 Devrim Gündüz - 6.4.3-4 -- Rebuild against new GEOS - -* Thu Oct 3 2013 Volker Fröhlich - 6.4.3-3 -- Add patch for release name encoding crash -- Use upstream desktop file (BZ #986852) -- Install icons of different sizes - -* Sat Sep 14 2013 Volker Fröhlich - 6.4.3-2 -- Remove gcc patch (upstream) -- Remove useless BR for libjpeg -- Make config.h a source file instead of defining it in the spec file -- Truncate changelog - -* Thu Sep 12 2013 Devrim GÜNDÜZ - 6.4.3-1 -- Update to 6.4.3 -- Rebuild with new geos. - -* Tue Aug 27 2013 Orion Poplawski - 6.4.2-11 -- Rebuild for gdal 1.10.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 6.4.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Apr 12 2013 Jon Ciesla - 6.4.2-9 -- Drop desktop vendor tag. - -* Wed Mar 06 2013 Devrim GÜNDÜZ - 6.4.2-8 -- Rebuild with new geos. - -* Fri Jan 25 2013 Devrim GÜNDÜZ - 6.4.2-7 -- Rebuild with geos 3.3.7. - -* Sun Nov 18 2012 Volker Fröhlich - 6.4.2-6 -- Rebuild with ever newer geos - -* Wed Nov 14 2012 Devrim GÜNDÜZ - 6.4.2-5 -- Rebuild with new geos. - -* Thu Jul 19 2012 Fedora Release Engineering - 6.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Devrim GÜNDÜZ - 6.4.2-3 -- Rebuilt - -* Sun Mar 4 2012 Volker Fröhlich - 6.4.2-2 -- Solve name conflict with "parallel" man pages (BZ 797824) -- Correct man page encoding conversion -- Build with multiple workers; assumuption on race-condition was wrong - -* Fri Mar 2 2012 Tom Callaway - 6.4.2-1 -- update to 6.4.2 - -* Tue Feb 28 2012 Fedora Release Engineering - 6.4.1-8 -- Rebuilt for c++ ABI breakage - -* Tue Jan 10 2012 Volker Fröhlich - 6.4.1-7 -- Race condition in build system assumed -- going back to one worker - -* Mon Jan 9 2012 Devrim GÜNDÜZ - 6.4.1-6 -- Rebuilt with new geos - -* Wed Nov 23 2011 Volker Fröhlich - 6.4.1-5 -- Move string substitution back to the install section, because - it causes problems otherwise -- Add patch for libpng API change - -* Wed Nov 02 2011 Volker Fröhlich - 6.4.1-4 -- Remove encoding from desktop file -- Remove BR on wxGTK, because wxGTK requires it anyway -- Disable Ubuntu patches, because they don't seem to work in Fedora -- Move all the string substitution for locales and docs to prep -- Use name macro in Source -- Drop custom compiler flags -- no evidence they serve a purpose -- Remove 2 unnecessary chmods -- Don't use sysconfdir macro in places, where etc means something different -- Add contributors to documentation - -* Wed Nov 02 2011 Volker Fröhlich - 6.4.1-3 -- Patch locale and documentation paths properly for the GUI - -* Thu Sep 22 2011 Volker Fröhlich - 6.4.1-2 -- Remove duplicate documentation -- Correct further documentation paths -- Create version-less symlinks for library directory and binary -- Supply all lang files to the files section directly -- Add ternary operator patch for Python 2.4 (ELGIS) - -* Tue Aug 02 2011 Volker Fröhlich - 6.4.1-1 -- Update to 6.4.1 -- Remove explicit lib and include dirs, where not necessary -- Really build with geos -- Remove sed call on ncurses - -* Tue Aug 02 2011 Volker Fröhlich - 6.4.0-4 -- Correct license to GPLv2+ -- Update URL -- Replace define with global macro -- Devel package required itself -- Simplify setup macro -- Don't add -lm manually anymore -- Correct FSF postal address -- Drop cstdio patch -- Correct Exec and Icon entry in desktop file -- Remove wrong and unnecessary translation entries from desktop file - GRASS didn't start for the first issue -- Add numpy as requirement -- Delete defattr, as the defaults work right -- Use name macro where possible -- Devel package required itself -- Changelog doesn't need encoding conversion anymore - Same goes for translators and infrastructure files -- Use mandir macro on one occasion -- Introduce "shortversion" macro -- Beautify case construction for 64 bit build flags -- Update syntax for Require on base package to guidelines -- Don't list LOCALE files twice, own directory -- Don't ship same documentation in different packages -- Drop README -- Simplify file list in devel package -- Replace extra icon source with one from the tarball - -* Wed Mar 23 2011 Dan Horák - 6.4.0-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Wed Feb 09 2011 Fedora Release Engineering - 6.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 22 2010 Viji Nair - 6.4.0-1 -- Rebuilt with new gdal 1.7.3. -- Updated to upstream version 6.4.0. -- Removed grass-gdilib.patch -- Spec review - -* Fri Dec 4 2009 Devrim GÜNDÜZ - 6.3.0-15 -- Rebuilt with new geos - -* Fri Aug 21 2009 Tomas Mraz - 6.3.0-14 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 6.3.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Mar 23 2009 Lubomir Rintel - 6.3.0-12 -- Fix build with GCC 4.4 - -* Tue Feb 24 2009 Fedora Release Engineering - 6.3.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 29 2009 Balint Cristian - 6.3.0-10 -- email change -- rebuild for new mysql - -* Sun Dec 07 2008 Balint Cristian 6.3.0-9 -- rebuild against newer gdal - -* Sun Dec 07 2008 Balint Cristian 6.3.0-8 -- rebuild against newer gdal - -* Sun Nov 30 2008 Ignacio Vazquez-Abrams 6.3.0-7 -- Rebuild for Python 2.6 - -* Sun Aug 24 2008 Balint Cristian 6.3.0-6 -- bz#458427 (prelink fail) -- bz#458563 (grass not able to display documentation) - -* Sat Jul 05 2008 Balint Cristian 6.3.0-5 -- address bz#454146 (wxPython miss) - -* Thu Jun 12 2008 Balint Cristian 6.3.0-4 -- address bz#341391 (multilib issue) - -* Mon May 26 2008 Balint Cristian 6.3.0-3 -- bugfix initscripts permission - -* Thu May 15 2008 Balint Cristian 6.3.0-2 -- require swig to build - -* Thu May 15 2008 Balint Cristian 6.3.0-1 -- final stable release upstream diff --git a/grass72_ctypes_gcc7.diff b/grass72_ctypes_gcc7.diff deleted file mode 100644 index 6ee91e7..0000000 --- a/grass72_ctypes_gcc7.diff +++ /dev/null @@ -1,90 +0,0 @@ -Index: grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py -=================================================================== ---- grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218) -+++ grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219) -@@ -1,59 +1,8 @@ - # lextab.py. This file automatically created by PLY (version 2.2). Don't edit! --_lextokens = { -- 'RIGHT_OP': None, -- 'RIGHT_ASSIGN': None, -- 'DEC_OP': None, -- 'PP_MACRO_PARAM': None, -- 'DIV_ASSIGN': None, -- 'PP_DEFINE': None, -- 'PP_END_DEFINE': None, -- 'PP_DEFINE_MACRO_NAME': None, -- 'HEADER_NAME': None, -- 'NEWLINE': None, -- 'CHARACTER_CONSTANT': None, -- 'PP_STRINGIFY': None, -- 'AND_ASSIGN': None, -- 'PTR_OP': None, -- 'ELLIPSIS': None, -- 'IDENTIFIER': None, -- 'ADD_ASSIGN': None, -- 'PERIOD': None, -- 'AND_OP': None, -- 'OTHER': None, -- 'LPAREN': None, -- 'LEFT_OP': None, -- 'LE_OP': None, -- 'OR_OP': None, -- 'SUB_ASSIGN': None, -- 'MOD_ASSIGN': None, -- 'STRING_LITERAL': None, -- 'PP_IDENTIFIER_PASTE': None, -- 'PP_NUMBER': None, -- 'PP_DEFINE_NAME': None, -- 'XOR_ASSIGN': None, -- 'OR_ASSIGN': None, -- 'GE_OP': None, -- 'MUL_ASSIGN': None, -- 'LEFT_ASSIGN': None, -- 'INC_OP': None, -- 'NE_OP': None, -- 'EQ_OP': None} --_lexreflags = 0 --_lexliterals = '' -+_lextokens = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None} -+_lexreflags = 0 -+_lexliterals = '' - _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'} --_lexstatere = { -- 'INITIAL': [ -- ('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ -- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ -- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P[FflL]?)(?!\\w))', [ -- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [ -- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P\\#define)', [ -- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [ -- ('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ -- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ -- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P[FflL]?)(?!\\w))', [ -- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [ -- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P(\\#\\#)|(\\#))', [ -- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]} -+_lexstatere = {'INITIAL': [('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]} - _lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'} - _lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'} -Index: grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py -=================================================================== ---- grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71218) -+++ grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71219) -@@ -53,5 +53,5 @@ - 'H': '[a-fA-F0-9]', - 'E': '[Ee][+-]?\s*{D}+', -- 'FS': '[FflL]', -+ 'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)', - 'IS': '[uUlL]*', - } -@@ -227,8 +227,8 @@ - suf = m.group("suf") - -- if dp or exp or (suf and suf in ("Ff")): -+ if dp or exp or (suf and suf not in ("Ll")): - s = m.group(0) - if suf: -- s = s[:-1] -+ s = s[:-len(suf)] - # Attach a prefix so the parser can figure out if should become an - # integer, float, or long diff --git a/grass72_rpc_removal.diff b/grass72_rpc_removal.diff deleted file mode 100644 index 48e8762..0000000 --- a/grass72_rpc_removal.diff +++ /dev/null @@ -1,43 +0,0 @@ -Index: grass-7.2.2/lib/raster/get_row.c -=================================================================== ---- grass-7.2.2/lib/raster/get_row.c (revision 71935) -+++ grass-7.2.2/lib/raster/get_row.c (revision 71944) -@@ -15,6 +15,4 @@ - #include - #include -- --#include /* need this for sgi */ - - #include -Index: grass-7.2.2/lib/raster/open.c -=================================================================== ---- grass-7.2.2/lib/raster/open.c (revision 71935) -+++ grass-7.2.2/lib/raster/open.c (revision 71944) -@@ -13,6 +13,4 @@ - */ - --#include --#include - #include - #include -Index: grass-7.2.2/lib/raster/range.c -=================================================================== ---- grass-7.2.2/lib/raster/range.c (revision 71935) -+++ grass-7.2.2/lib/raster/range.c (revision 71944) -@@ -13,5 +13,4 @@ - - #include --#include /* need this for sgi */ - - #include - Index: grass-7.2.2/lib/raster/R.h -=================================================================== ---- grass-7.2.2/lib/raster/R.h (revision 72283) -+++ grass-7.2.2/lib/raster/R.h (revision 72284) -@@ -1,6 +1,5 @@ - #include - #include --#include - #ifdef HAVE_GDAL - #include - #endif diff --git a/sources b/sources deleted file mode 100644 index 7fc5351..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (grass-7.8.3.tar.gz) = 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84