[qgis] Update to 2.6.1
Dave Johansen
daveisfera at fedoraproject.org
Fri Jan 2 17:46:23 UTC 2015
commit eab7dcab0c6db3c4c114acab75fb3f06d993237f
Author: Dave Johansen <davejohansen at gmail.com>
Date: Fri Jan 2 10:44:47 2015 -0700
Update to 2.6.1
.gitignore | 1 +
qgis-2.6.0-qreal.patch | 47 -----------------------------------------------
qgis.spec | 11 +++++------
sources | 2 +-
4 files changed, 7 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 748bea5..f6fc754 100644
--- a/.gitignore
+++ b/.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
diff --git a/qgis.spec b/qgis.spec
index 1eee726..4767933 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -12,8 +12,8 @@
#TODO: Run test suite (see debian/rules)
Name: qgis
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.6.1
+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
@@ -173,7 +170,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 {} \+
@@ -393,6 +389,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Fri Jan 2 2015 Dave Johansen <davejohansen at gmail.com> - 2.6.1-1
+- Update to 2.6.1
+
* Sun Nov 2 2014 Volker Fröhlich <volker27 at 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
diff --git a/sources b/sources
index a1ea370..ec17be2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5540e0648caf261a264c2370be484163 qgis-2.6.0.tar.bz2
+e6d4233b5f8d4c7a77e289a9c794089f qgis-2.6.1.tar.bz2
More information about the scm-commits
mailing list