diff --git a/.gitignore b/.gitignore index a13d1dc..a4ac498 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ qgis_1.5.0.tar.gz /qgis-2.14.3.tar.bz2 /qgis-2.16.0.tar.bz2 /qgis-2.16.1.tar.bz2 +/qgis-2.16.2.tar.bz2 +/qgis-2.16.3.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 5020a4f..a7cd1df 100644 --- a/qgis.spec +++ b/qgis.spec @@ -4,31 +4,21 @@ # 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 - -%if 0%{?fedora} == 23 -%global grass_version 6.4.4 -%endif - -%if 0%{?fedora} == 24 -%global grass_version 7.0.3 +%if 0%{?fedora} >= 24 %global configure_with_grass7 -D WITH_GRASS7:BOOL=TRUE %endif #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.16.1 +Version: 2.16.3 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -48,6 +38,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: @@ -86,7 +79,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 @@ -143,7 +138,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. @@ -186,6 +184,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 {} \+ @@ -219,11 +218,9 @@ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/output/%{_lib} -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 \ %{configure_with_grass7} \ -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 \ @@ -306,10 +303,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 @@ -353,9 +346,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.* @@ -415,16 +405,34 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog -* Tue Aug 23 2016 Daniele Viganò - 2.16.1-1 +* Tue Sep 27 2016 Daniele Viganò - 2.16.3-1 +- New upstream release + +* Mon Sep 26 2016 Orion Poplawski - 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 - 2.14.3-6 +- rebuilt for matplotlib-2.0.0 + +* Tue Aug 23 2016 Daniele Viganò - 2.16.1-1 - New upstream release * Thu Aug 11 2016 Volker Froehlich - 2.14.3-5 - Replace dependency on PyQt4 with PyQt4-webkit, since webkit is in a sub-package now (BZ #1360485) -* Tue Jul 12 2016 Daniele Viganò - 2.16.0-1 +* Tue Jul 19 2016 Fedora Release Engineering - 2.14.3-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue Jul 12 2016 Daniele Viganò - 2.16.0-1 - New upstream release +* Tue Jun 07 2016 Volker Froehlich - 2.14.3-3 +- Version bump to be newer than F24 + * Mon Jun 06 2016 Volker Froehlich - 2.14.3-3 - Grass version in F24 is 7.0.3 for now diff --git a/sources b/sources index 722e4a0..765ba7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78d17e670e22825374e3f829fc120f45 qgis-2.16.1.tar.bz2 +50a1799c6eb8c90eeeda4affedeea49c qgis-2.16.3.tar.bz2