Merge branch 'master' into epel7

.gitignore

@@ -11,3 +11,4 @@ qgis_1.5.0.tar.gz
 /qgis-2.2.0.tar.bz2
 /qgis-2.4.0.tar.bz2
 /qgis-2.6.0.tar.bz2
+/qgis-2.6.1.tar.bz2

qgis-2.6.0-qreal.patch

@@ -1,47 +0,0 @@
-diff -rupN qgis-2.6.0/src/core/composer/qgscomposerhtml.cpp qgis-2.6.0-new/src/core/composer/qgscomposerhtml.cpp
---- qgis-2.6.0/src/core/composer/qgscomposerhtml.cpp	2014-10-31 15:17:19.000000000 +0100
-+++ qgis-2.6.0-new/src/core/composer/qgscomposerhtml.cpp	2014-11-12 14:22:46.152730089 +0100
-@@ -233,7 +233,7 @@ double QgsComposerHtml::maxFrameWidth()
-   QList<QgsComposerFrame*>::const_iterator frameIt = mFrameItems.constBegin();
-   for ( ; frameIt != mFrameItems.constEnd(); ++frameIt )
-   {
--    maxWidth = qMax( maxWidth, ( *frameIt )->boundingRect().width() );
-+    maxWidth = qMax( maxWidth, ( double ) ( ( *frameIt )->boundingRect().width() ) );
-   }
- 
-   return maxWidth;
-diff -rupN qgis-2.6.0/src/core/layertree/qgslayertreemodellegendnode.cpp qgis-2.6.0-new/src/core/layertree/qgslayertreemodellegendnode.cpp
---- qgis-2.6.0/src/core/layertree/qgslayertreemodellegendnode.cpp	2014-10-31 15:17:19.000000000 +0100
-+++ qgis-2.6.0-new/src/core/layertree/qgslayertreemodellegendnode.cpp	2014-11-12 14:20:59.325919209 +0100
-@@ -62,7 +62,7 @@ QgsLayerTreeModelLegendNode::ItemMetrics
-   // itemHeight here is not realy item height, it is only for symbol
-   // vertical alignment purpose, i.e. ok take single line height
-   // if there are more lines, thos run under the symbol
--  double itemHeight = qMax( settings.symbolSize().height(), textHeight );
-+  double itemHeight = qMax( ( double ) settings.symbolSize().height(), textHeight );
- 
-   ItemMetrics im;
-   im.symbolSize = drawSymbol( settings, ctx, itemHeight );
-@@ -334,8 +334,8 @@ QSizeF QgsSymbolV2LegendNode::drawSymbol
-     p->restore();
-   }
- 
--  return QSizeF( qMax( width + 2 * widthOffset, settings.symbolSize().width() ),
--                 qMax( height + 2 * heightOffset, settings.symbolSize().height() ) );
-+  return QSizeF( qMax( width + 2 * widthOffset, ( double ) settings.symbolSize().width() ),
-+				 qMax( height + 2 * heightOffset, ( double ) settings.symbolSize().height() ) );
- }
- 
- 
-diff -rupN qgis-2.6.0/src/core/qgslegendrenderer.cpp qgis-2.6.0-new/src/core/qgslegendrenderer.cpp
---- qgis-2.6.0/src/core/qgslegendrenderer.cpp	2014-10-31 15:17:19.000000000 +0100
-+++ qgis-2.6.0-new/src/core/qgslegendrenderer.cpp	2014-11-12 14:21:35.895213582 +0100
-@@ -375,7 +375,7 @@ QSizeF QgsLegendRenderer::drawTitle( QPa
-   switch ( halignment )
-   {
-     case Qt::AlignHCenter:
--      textBoxWidth = ( qMin( point.x(), legendWidth - point.x() ) - mSettings.boxSpace() ) * 2.0;
-+      textBoxWidth = ( qMin( ( double ) point.x(), legendWidth - point.x() ) - mSettings.boxSpace() ) * 2.0;
-       textBoxLeft = point.x() - textBoxWidth / 2.;
-       break;
-     case Qt::AlignRight:

qgis.spec

@@ -12,8 +12,8 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.6.0
+Version:        2.6.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -36,9 +36,6 @@ Source5:        %{name}-mime.xml
 # Fix detection problem for GRASS libraries
 Patch0:         %{name}-2.4.0-grass.patch
 
-# Provided by Sandro Mani, not submitted yet
-Patch1:         %{name}-2.6.0-qreal.patch
-
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
 # http://code.google.com/p/pyspatialite/issues/detail?id=3
@@ -172,7 +169,6 @@ Please refer to %{name}-mapserver-README.fedora for details!
 %prep
 %setup -q
 %patch0 -p1 -b .grass~
-%patch1 -p1 -b .qreal~
 
 # Remove executable permissions from source code files
 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@@ -392,6 +388,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Jan  2 2015 Dave Johansen <davejohansen@gmail.com> - 2.6.1-1
+- Update to 2.6.1
+
 * Sun Nov  2 2014 Volker Fröhlich <volker27@gmx.at> - 2.6.0-2
 - Fix the build on ARMv7hl, thanks to Sandro Mani!
 - Updated the removing of executable permissions from source code files

sources

@@ -1 +1 @@
-5540e0648caf261a264c2370be484163  qgis-2.6.0.tar.bz2
+e6d4233b5f8d4c7a77e289a9c794089f  qgis-2.6.1.tar.bz2