diff --git a/.gitignore b/.gitignore index 299545d..19bf38f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ qgis_1.5.0.tar.gz /qgis-3.16.2.tar.bz2 /qgis-3.16.3.tar.bz2 /qgis-3.18.0.tar.bz2 +/qgis-3.18.1.tar.bz2 +/qgis-3.18.2.tar.bz2 +/qgis-3.18.3.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 00c416f..5b912c1 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.18.0/cmake/PyQtMacros.cmake qgis-3.18.0-new/cmake/PyQtMacros.cmake ---- qgis-3.18.0/cmake/PyQtMacros.cmake 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/cmake/PyQtMacros.cmake 2021-02-19 18:17:53.426724683 +0100 +diff -rupN --no-dereference qgis-3.18.1/cmake/PyQtMacros.cmake qgis-3.18.1-new/cmake/PyQtMacros.cmake +--- qgis-3.18.1/cmake/PyQtMacros.cmake 2021-03-19 13:09:08.000000000 +0100 ++++ qgis-3.18.1-new/cmake/PyQtMacros.cmake 2021-03-24 00:58:44.476156905 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 6914afc..d85364c 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.18.0/src/core/qgsapplication.cpp qgis-3.18.0-new/src/core/qgsapplication.cpp ---- qgis-3.18.0/src/core/qgsapplication.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/core/qgsapplication.cpp 2021-02-19 18:17:55.300724539 +0100 -@@ -307,6 +307,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.18.1/src/core/qgsapplication.cpp qgis-3.18.1-new/src/core/qgsapplication.cpp +--- qgis-3.18.1/src/core/qgsapplication.cpp 2021-03-19 13:09:08.000000000 +0100 ++++ qgis-3.18.1-new/src/core/qgsapplication.cpp 2021-03-24 00:58:46.103156947 +0100 +@@ -311,6 +311,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index 09bb2a2..ccca2ee 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,7 +7,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.18.0 +Version: 3.18.3 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -29,7 +29,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch - +# Fix for Proj8 detection +Patch2: %{name}_proj8.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -44,6 +45,7 @@ BuildRequires: grass-devel BuildRequires: gsl-devel BuildRequires: libspatialite-devel BuildRequires: libdxfrw-devel +BuildRequires: libxml2-devel BuildRequires: libzip-devel BuildRequires: make BuildRequires: netcdf-devel @@ -294,6 +296,21 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sun May 16 2021 Sandro Mani - 3.18.3-1 +- Update to 3.18.3 + +* Sat Apr 17 2021 Sandro Mani - 3.18.2-1 +- Update to 3.18.2 + +* Wed Mar 31 2021 Jonathan Wakely - 3.18.1-2 +- Rebuilt for removed libstdc++ symbols (#1937698) + +* Wed Mar 24 2021 sandro Mani - 3.18.1-1 +- Update to 3.18.1 + +* Tue Mar 30 2021 Jonathan Wakely - 3.18.0-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Fri Feb 19 2021 Sandro Mani - 3.18.0-1 - Update to 3.18.0 diff --git a/qgis_proj8.patch b/qgis_proj8.patch new file mode 100644 index 0000000..4bf6c59 --- /dev/null +++ b/qgis_proj8.patch @@ -0,0 +1,16 @@ +diff -rupN qgis-3.18.1/cmake/FindProj.cmake qgis-3.18.1-new/cmake/FindProj.cmake +--- qgis-3.18.1/cmake/FindProj.cmake 2021-03-19 13:09:08.000000000 +0100 ++++ qgis-3.18.1-new/cmake/FindProj.cmake 2021-03-24 10:05:30.492088939 +0100 +@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h + "$ENV{INCLUDE}" + "$ENV{LIB_DIR}/include" + ) ++IF (NOT PROJ_INCLUDE_DIR) ++ FIND_PATH(PROJ_INCLUDE_DIR proj.h ++ "$ENV{INCLUDE}" ++ "$ENV{LIB_DIR}/include" ++ ) ++ENDIF (NOT PROJ_INCLUDE_DIR) + + FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS + "$ENV{LIB}" diff --git a/sources b/sources index aac6e12..6d26b10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.18.0.tar.bz2) = 881709f781f8594153509e622361223608547b211cdfd570511eef563be8c4ac2ca388caf3d46211f583241d0e12435c957a8367218a78255022bc047ba24572 +SHA512 (qgis-3.18.3.tar.bz2) = d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef