From fedeff340e74903dcd49f0755ef7c03973272153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sat, 24 Sep 2011 23:23:35 +0200 Subject: [PATCH] NEW RELEASE 1.7.1 - Build with Qwtpolar - Use a GRASS_PREFIX to partially address BZ 711860 The other part is to place a versionless symlink in the Grass package --- .gitignore | 1 + qgis.spec | 49 +++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 6623916..36cb8f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ qgis_1.5.0.tar.gz /qgis_1.6.0.tar.gz /qgis-1.7.0.tar.bz2 +/qgis-1.7.1.tar.bz2 diff --git a/qgis.spec b/qgis.spec index de6b063..ee07ffc 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,8 +8,8 @@ %endif Name: qgis -Version: 1.7.0 -Release: 5%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -30,18 +30,17 @@ Patch0: qgis-1.5.0-grass.patch # https://bugzilla.redhat.com/show_bug.cgi?id=712620 # Avoid segfault when geo-referencing +# Was added to 1.7.2 Patch1: %{name}-1.7.0-georef-crash.patch # https://github.com/qgis/Quantum-GIS/commit/7d145a94524a6bfc025bfe36388c071f35a16f8a # https://github.com/qgis/Quantum-GIS/commit/834fc0b710171a80a29038f74ad2c603bf015424 -# Remove potential memory leak and negative frequencies in histogram -Patch2: %{name}-1.7.0-histogram.patch # Leaving it to make life easier for ELGIS, as long as they target RHEL 5 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # TODO: Pyspatialite is included if you use the bundled libspatialite. -# Do you really need it? +# Some plug-ins need it. # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 # It also is sort of a fork of pysqlite, which is not elegant. @@ -56,8 +55,6 @@ BuildRequires: geos-devel # No GRASS package in EPEL 6 %if ! 0%{?rhel} -# Grass package contains definitions, the configure script needs. -BuildRequires: grass BuildRequires: grass-devel %endif @@ -77,7 +74,7 @@ BuildRequires: qt4-webkit-devel BuildRequires: qwt-devel # Coming soon: https://bugzilla.redhat.com/show_bug.cgi?id=706593 -#BuildRequires: qwtpolar-devel +BuildRequires: qwtpolar-devel BuildRequires: sip-devel > 4.7 BuildRequires: sqlite-devel @@ -117,6 +114,7 @@ Summary: GRASS Support Libraries for Quantum GIS Group: Applications/Engineering Requires: %{name} = %{version}-%{release} # The plug-in requires more than just the grass-libs. +#TODO: I think, that is still correct, but the sense of the libs package is questionable Requires: grass %description grass @@ -152,7 +150,6 @@ Please refer to %{name}-mapserver-README.fedora for details! %setup -q %patch0 -p1 -b .grass %patch1 -p1 -b .georef -%patch2 -p1 -b .histogram # Update FSF address or ship a GPLv3+ license file # http://hub.qgis.org/issues/3789 @@ -162,18 +159,17 @@ sed -i 's/02111-1307/02110-1301/' COPYING # Readme file for QGIS mapserver configuration and Lighttpd sample install -pm0644 %{SOURCE4} . -# Delete bundled libspatialite +# Delete bundled libs rm -rf src/core/spatialite - -# Coming soon -#rm -rf src/core/gps/qwtpolar +rm -rf src/core/gps/qwtpolar #find src/core/spatialindex -type d -exec rm -rf {} \; #rm -rf src/core/spatialindex/rtree #rm -rf src/core/pal -# TODO: Unused-direct-shlib-dependencies -# They don't drag in new dependencies though +chmod 644 src/mapserver/qgswmsserver.cpp src/app/composer/qgscomposer.cpp + +# The path from WITH_GRASS is used, when trying to find GISBASE. %build %cmake \ @@ -183,17 +179,18 @@ rm -rf src/core/spatialite -D QGIS_PLUGIN_SUBDIR=%{_lib}/%{name} \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D WITH_BINDINGS:BOOL=TRUE \ + -D GRASS_PREFIX=%{_libdir}/grass \ -D WITH_MAPSERVER:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D GDAL_INCLUDE_DIR=%{_includedir}/gdal \ -D GDAL_LIBRARY=%{_libdir}/libgdal.so \ -D ENABLE_TESTS:BOOL=FALSE \ + -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ %{configure_with_spatialite} \ . - #-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ -# Parallel make leads to race conditions +# Parallel make lead to race conditions # http://hub.qgis.org/issues/2880 #make # Seems to be fine from version 1.7 on @@ -249,7 +246,7 @@ rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld # Remove files packaged by doc pushd %{buildroot}%{_datadir}/%{name}/doc rm -f BUGS \ - ChangeLog \ + CHANGELOG \ CODING \ COPYING \ INSTALL \ @@ -278,6 +275,7 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +#TODO: Wo kommt der Pfad-Vorschlag für GISBASE her? update-mime-database %{_datadir}/mime &> /dev/null || : %posttrans @@ -296,12 +294,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang #TODO: Encoding problem on the help page # CONTRIBUTORS and AUTHORS are intended be viewed in the About-Box -%doc BUGS ChangeLog CODING COPYING Exception_to_GPL_for_Qt.txt PROVENANCE README +%doc BUGS CHANGELOG CODING COPYING Exception_to_GPL_for_Qt.txt PROVENANCE README # QGIS shows these files in the GUI %{_datadir}/%{name}/doc %dir %{_datadir}/%{name}/i18n/ -%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm %{_libdir}/lib%{name}_analysis.so.%{version} %{_libdir}/lib%{name}_core.so.%{version} %{_libdir}/lib%{name}_gui.so.%{version} @@ -355,6 +352,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/%{name} %changelog +* Sat Sep 24 2011 Volker Fröhlich - 1.7.1-1 +- Update for new release +- Drop one patch that made it into the release +- Correct permissions for two cpp files +- Change spelling for changelog file +- Findlang seems to find sr@latin now, so don't explicitly list it +- Build with Qwtpolar +- Remove grass as BR +- Add GRASS_PREFIX again + Cmake uses the first entry in FindGRASS.cmake, + which is not fine for 64 bit systems + * Mon Jul 23 2011 Volker Fröhlich - 1.7.0-5 - Extend histogram patch, see BZ 725161 diff --git a/sources b/sources index 6a9a53d..64aeff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8506990f52563d39c7b916f500f282f qgis-1.7.0.tar.bz2 +677dcb9d0d53cc7c2a6451590a362477 qgis-1.7.1.tar.bz2