Update to 2.16.2 (bug #1378240)

- Add patch to fix build on 64-bit machines
- Drop unused cmake options
- Move %grass_version macro to grass-devel, make it an install requirement

.gitignore

@@ -23,3 +23,4 @@ qgis_1.5.0.tar.gz
 /qgis-2.14.0.tar.bz2
 /qgis-2.14.1.tar.bz2
 /qgis-2.14.3.tar.bz2
+/qgis-2.16.2.tar.bz2

qgis-lib64.patch

@@ -0,0 +1,13 @@
+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
+@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+   ELSE(WIN32)
+     # TODO osx
+     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+-    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(WIN32)
+ 
+   FOREACH(it ${ARGN})

qgis.spec

@@ -4,24 +4,19 @@
 # https://hub.qgis.org/issues/2854
 
 # libspatialite is present for PPC and PPC64 in Fedora and EL7, but not in older EL
-%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
+%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE
 %if (0%{?rhel} <= 6 && !0%{?fedora})
 %ifarch ppc ppc64
-%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
+%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE
 %endif
 %endif
 
 
-# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
-# the soname might stay the same, it won't work anymore.
-#http://hub.qgis.org/issues/5274
-%global grass_version 7.0.4
-
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.14.3
+Version:        2.16.2
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -40,6 +35,9 @@ Source4:        %{name}-server-README.fedora
 # MIME definitions
 # Based on debian/qgis.xml but excluding already defined or proprietary types
 Source5:        %{name}-mime.xml
+# Fix builds on 64-bit machines
+# https://hub.qgis.org/issues/15602
+Patch0:         %{name}-lib64.patch
 
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
@@ -56,7 +54,7 @@ BuildRequires:  fcgi-devel
 BuildRequires:  flex bison
 BuildRequires:  gdal-devel
 BuildRequires:  geos-devel
-BuildRequires:  grass-devel = %{grass_version}
+BuildRequires:  grass-devel
 BuildRequires:  gsl-devel
 
 %ifarch ppc ppc64
@@ -78,7 +76,9 @@ BuildRequires:  python2-devel
 # qca2 is a virtual provides of qca. Put here to make things easier for EPEL!
 BuildRequires:  qca2-devel
 BuildRequires:  qextserialport-devel
+BuildRequires:  qjson-devel
 BuildRequires:  qscintilla-devel
+BuildRequires:  qscintilla-python
 BuildRequires:  qscintilla-python-devel
 BuildRequires:  qt4-devel
 #BuildRequires:  qt-mobility-devel
@@ -134,7 +134,10 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 # The plug-in requires more than just the grass-libs.
 # This questions the sense of the libs package.
-Requires:       grass
+# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
+# the soname might stay the same, it won't work anymore.
+#http://hub.qgis.org/issues/5274
+Requires:       grass%{?_isa} = %{grass_version}
 
 %description grass
 GRASS plugin for QGIS required to interface with the GRASS system.
@@ -177,6 +180,7 @@ Please refer to %{name}-server-README.fedora for details!
 
 %prep
 %setup -q
+%patch0 -p1 -b .lib64
 
 # Remove executable permissions from source code files
 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@@ -210,11 +214,9 @@ gzip ChangeLog
       -D QGIS_MANUAL_SUBDIR=/share/man \
       -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
-      -D MAPSERVER_SKIP_ECW=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
       -D WITH_GRASS7:BOOL=TRUE \
       -D GRASS_PREFIX=%{_libdir}/grass \
-      -D WITH_MAPSERVER:BOOL=TRUE \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
       -D ENABLE_TESTS:BOOL=FALSE \
@@ -299,10 +301,6 @@ rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld
 # Remove install instructions
 rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL
 
-# Name of locale is wrong
-#mv %{buildroot}/usr/share/qgis/i18n/qgis_sr_Latn.qm \
-    #%{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm
-
 %find_lang %{name} --with-qt
 
 
@@ -346,9 +344,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %dir %{_datadir}/%{name}/i18n/
 %lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm
 %lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm
-%if 0%{?rhel}
-%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
-%endif
 %{_libdir}/lib%{name}_app.so.*
 %{_libdir}/lib%{name}_analysis.so.*
 %{_libdir}/lib%{name}_core.so.*
@@ -408,6 +403,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Sep 21 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.2-1
+- Update to 2.16.2 (bug #1378240)
+- Add patch to fix build on 64-bit machines
+- Drop unused cmake options
+- Move %%grass_version macro to grass-devel, make it an install requirement
+
 * Mon Sep 26 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.14.3-6
 - rebuilt for matplotlib-2.0.0
 

sources

@@ -1 +1 @@
-8598c7bbe47d3b88c0df5524589d2cb0  qgis-2.14.3.tar.bz2
+e2a24b2c41af83dcc5b26fcd0e63366b  qgis-2.16.2.tar.bz2