dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Update to 2.18.25

Browse Source
This commit is contained in:
Sandro Mani 2018-11-14 14:46:22 +01:00
parent cc17e22c1f
commit 52294d0c6a
6 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ qgis_1.5.0.tar.gz
/qgis-2.18.15.tar.bz2
/qgis-2.18.16.tar.bz2
/qgis-2.18.20.tar.bz2
/qgis-2.18.25.tar.bz2

12
qgis-2.18.20-grass.patch
View File

@ -1,15 +1,3 @@
diff -rupN qgis-2.18.20/cmake/FindGRASS.cmake qgis-2.18.20-new/cmake/FindGRASS.cmake
--- qgis-2.18.20/cmake/FindGRASS.cmake 2018-05-18 14:01:08.000000000 +0200
+++ qgis-2.18.20-new/cmake/FindGRASS.cmake 2018-11-02 12:01:30.000000000 +0100
@@ -28,7 +28,7 @@ MACRO (CHECK_GRASS G_PREFIX)
#MESSAGE(STATUS "GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} = ${GRASS_MAJOR_VERSION${GRASS_FIND_VERSION}}")
IF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} EQUAL GRASS_FIND_VERSION)
SET(GRASS_LIBRARIES_FOUND${GRASS_FIND_VERSION} TRUE)
- SET(GRASS_LIB_NAMES${GRASS_FIND_VERSION} gis dig2 dbmiclient dbmibase shape dgl rtree datetime linkm gproj)
+ SET(GRASS_LIB_NAMES${GRASS_FIND_VERSION} gis dbmiclient dbmibase shape dgl rtree datetime linkm gproj)
IF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} LESS 7 )
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} vect)
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} form)
diff -rupN qgis-2.18.20/src/plugins/grass/scripts/db.connect-login.pg.py qgis-2.18.20-new/src/plugins/grass/scripts/db.connect-login.pg.py
--- qgis-2.18.20/src/plugins/grass/scripts/db.connect-login.pg.py 2018-05-18 14:01:08.000000000 +0200
+++ qgis-2.18.20-new/src/plugins/grass/scripts/db.connect-login.pg.py 2018-11-02 13:24:02.276460662 +0100

21
qgis-2.18.20-sip.patch
View File

@ -1,24 +1,3 @@
diff -rupN qgis-2.18.20/cmake/FindSIP.cmake qgis-2.18.20-new/cmake/FindSIP.cmake
--- qgis-2.18.20/cmake/FindSIP.cmake 2018-05-18 14:01:08.000000000 +0200
+++ qgis-2.18.20-new/cmake/FindSIP.cmake 2018-11-01 23:42:52.907619884 +0100
@@ -41,7 +41,7 @@ ELSE(SIP_VERSION)
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
- STRING(REGEX REPLACE ".*\nsip_mod_dir:([^\n]+).*$" "\\1" SIP_MOD_DIR ${sip_config})
+ STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MOD_DIR ${sip_config})
SET(SIP_FOUND TRUE)
ENDIF(sip_config)
diff -rupN qgis-2.18.20/cmake/FindSIP.py qgis-2.18.20-new/cmake/FindSIP.py
--- qgis-2.18.20/cmake/FindSIP.py 2018-05-18 14:01:08.000000000 +0200
+++ qgis-2.18.20-new/cmake/FindSIP.py 2018-11-01 23:56:35.778989661 +0100
@@ -39,4 +39,4 @@ print("sip_version_str:%s" % sipcfg.sip_
print("sip_bin:%s" % sipcfg.sip_bin)
print("default_sip_dir:%s" % sipcfg.default_sip_dir)
print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
-print("sip_mod_dir:%s" % sipcfg.sip_mod_dir)
+print("sip_module_dir:%s" % sipcfg.sip_module_dir)
diff -rupN qgis-2.18.20/python/PyQt/PyQt4/QtCore.py qgis-2.18.20-new/python/PyQt/PyQt4/QtCore.py
--- qgis-2.18.20/python/PyQt/PyQt4/QtCore.py 2018-05-18 14:01:08.000000000 +0200
+++ qgis-2.18.20-new/python/PyQt/PyQt4/QtCore.py 2018-11-01 22:07:20.597278848 +0100

7
qgis-lib64.patch
View File

@ -1,7 +1,6 @@
diff -up qgis-2.16.2/CMakeLists.txt.lib64 qgis-2.16.2/CMakeLists.txt
diff -up qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 qgis-2.16.2/cmake/PyQtMacros.cmake
--- qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 2016-08-26 05:58:37.000000000 -0600
+++ qgis-2.16.2/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600
diff -rupN qgis-2.18.25/cmake/PyQtMacros.cmake qgis-2.18.25-new/cmake/PyQtMacros.cmake
--- qgis-2.18.25/cmake/PyQtMacros.cmake 2018-10-26 13:59:08.000000000 +0200
+++ qgis-2.18.25-new/cmake/PyQtMacros.cmake 2018-11-14 00:15:36.247074662 +0100
@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
ELSE(WIN32)
# TODO osx

12
qgis.spec
View File

@ -15,8 +15,8 @@
#TODO: Run test suite (see debian/rules)
Name: qgis
Version: 2.18.20
Release: 3%{?dist}
Version: 2.18.25
Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
# http://hub.qgis.org/issues/3789
@ -41,7 +41,7 @@ Patch0: %{name}-lib64.patch
# Fix sip import for namespaced sip
Patch1: %{name}-2.18.20-sip.patch
# Fix grass not found, fix grass scripts shebangs
# Fix grass scripts shebangs
Patch2: %{name}-2.18.20-grass.patch
# Some plug-ins need Pyspatialite (bundled)
@ -107,7 +107,7 @@ Requires: qca-ossl
# We don't want to provide private Python extension libs
%if (0%{?fedora} || 0%{?rhel} > 6)
%global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%global __provides_exclude_from ^(%{python2_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%endif
%if 0%{?rhel} == 6
@ -417,6 +417,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Wed Nov 14 2018 Sandro Mani <manisandro@gmail.com> - 2.18.25-1
- Update to 2.18.25
- Fix broken provides
* Sat Nov 03 2018 Sandro Mani <manisandro@gmail.com> - 2.18.20-3
- Fix broken requires
- Fix build with namespaced SIP

2
sources
View File

@ -1 +1 @@
SHA512 (qgis-2.18.20.tar.bz2) = 094e33019d6832e09d5aace067a2870ac1dffa86cdeef70666c8c344f79c4a16de6b16074349e8430fadda62e987d5b6517cf337fd06c4cc0e4e84b85a749199
SHA512 (qgis-2.18.25.tar.bz2) = aca83d615553a66092b660aa621ded272c8cfed8651b817cbbd69b16a0eafd2749dc3bfa9515c4296d6b65b54cf6a3d8abdf1110d809bac96e3e5eb21eef8f19