10 Commits

Author SHA1 Message Date
Dave Johansen
dbb8499d6b Merging 2.14.3 update from master 2016-06-22 21:26:45 -06:00
Dave Johansen
cf6f78648e Fix grass dependency for EL 2016-04-11 21:46:29 -07:00
Dave Johansen
b954fbbbd8 Fixing qca BuildRequires for EL 7 2016-04-08 23:22:32 -07:00
Dave Johansen
43714831db Merging 2.14.1 from master 2016-04-08 23:21:07 -07:00
Dave Johansen
adc366a958 Update to 2.8.4 2015-12-03 19:12:38 -07:00
Dave Johansen
b6ce3a6a14 Updating to 2.8.3 2015-08-07 20:22:16 -07:00
Dave Johansen
db1af8c951 Putting back in the BuildRequires for PyQwt-devel but just conditionally removing it on RHEL for now 2015-06-09 20:43:33 -07:00
Dave Johansen
29b099fc66 Merge branch 'master' into epel7
Updating to 2.8
2015-06-09 20:35:50 -07:00
Dave Johansen
3a18fe2d2b Merge branch 'master' into epel7 2015-01-02 13:57:03 -07:00
Dave Johansen
aa0543a0ef PyQwt isn't available for Qwt 6.1.1 so don't use it for the time being 2015-01-02 10:26:57 -07:00
12 changed files with 112 additions and 756 deletions

42
.gitignore vendored
View File

@@ -1,17 +1,25 @@
/qgis-2.18.0.tar.bz2
/qgis-2.18.1.tar.bz2
/qgis-2.18.2.tar.bz2
/qgis-2.18.3.tar.bz2
/qgis-2.18.4.tar.bz2
/qgis-2.18.5.tar.bz2
/qgis-2.18.6.tar.bz2
/qgis-2.18.7.tar.bz2
/qgis-2.18.8.tar.bz2
/qgis-2.18.9.tar.bz2
/qgis-2.18.10.tar.bz2
/qgis-2.18.11.tar.bz2
/qgis-2.18.12.tar.bz2
/qgis-2.18.13.tar.bz2
/qgis-2.18.14.tar.bz2
/qgis-2.18.15.tar.bz2
/qgis-2.18.16.tar.bz2
qgis_1.5.0.tar.gz
/qgis_1.6.0.tar.gz
/qgis-1.7.0.tar.bz2
/qgis-1.7.1.tar.bz2
/qgis-1.7.2.tar.bz2
/qgis-1.7.3.tar.bz2
/qgis-1.7.4.tar.bz2
/qgis-1.8.0.tar.bz2
/qgis-2.0.0.tar.bz2
/qgis-2.0.1.tar.bz2
/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.8.1.tar.bz2
/qgis-2.8.2.tar.bz2
/qgis-2.10.0.tar.bz2
/qgis-2.10.1.tar.bz2
/qgis-2.12.0.tar.bz2
/qgis-2.12.1.tar.bz2
/qgis-2.12.2.tar.bz2
/qgis-2.12.3.tar.bz2
/qgis-2.14.0.tar.bz2
/qgis-2.14.1.tar.bz2
/qgis-2.14.3.tar.bz2

13
qgis-2.12.0-arm.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
index 4a42a6d..5a4b975 100644
--- a/src/app/qgswelcomepageitemsmodel.cpp
+++ b/src/app/qgswelcomepageitemsmodel.cpp
@@ -114,7 +114,7 @@ QSize QgsWelcomePageItemDelegate::sizeHint( const QStyleOptionViewItem & option,
index.data( QgsWelcomePageItemsModel::CrsRole ).toString() ) );
doc.setTextWidth( width - ( !icon.isNull() ? icon.width() + 35 : 35 ) );
- return QSize( width, qMax( doc.size().height() + 10, ( double )icon.height() ) + 20 );
+ return QSize( width, qMax( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 );
}
QgsWelcomePageItemsModel::QgsWelcomePageItemsModel( QObject* parent )

View File

@@ -0,0 +1,43 @@
From 30449e577f0cd432bd8c60787743fba54c1e51b9 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 3 Mar 2016 10:34:32 +1100
Subject: [PATCH] Fix fetching subset of attributes with mssql (fix #14402),
add test
---
src/providers/mssql/qgsmssqlfeatureiterator.cpp | 2 +-
tests/src/python/providertestbase.py | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
index 53214d4..560d344 100644
--- a/src/providers/mssql/qgsmssqlfeatureiterator.cpp
+++ b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
for ( int i = 0; i < mAttributesToFetch.count(); i++ )
{
QVariant v = mQuery->value( i );
- const QgsField &fld = mSource->mFields.at( i );
+ const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) );
if ( v.type() != fld.type() )
v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );
feature.setAttribute( mAttributesToFetch.at( i ), v );
diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py
index 7b8707e..26e6d86 100644
--- a/tests/src/python/providertestbase.py
+++ b/tests/src/python/providertestbase.py
@@ -384,3 +384,14 @@ def testClosedIterators(self):
# Test rewinding closed iterator
self.assertFalse(f_it.rewind(), 'Rewinding closed iterator successful, should not be allowed')
+
+ def testGetFeaturesSubsetAttributes(self):
+ """ Test that expected results are returned when using subsets of attributes """
+
+ tests = {'pk': set([1, 2, 3, 4, 5]),
+ 'cnt': set([-200, 300, 100, 200, 400]),
+ 'name': set(['Pear', 'Orange', 'Apple', 'Honey', NULL]),
+ 'name2': set(['NuLl', 'PEaR', 'oranGe', 'Apple', 'Honey'])}
+ for field, expected in tests.iteritems():
+ result = set([f[field] for f in self.provider.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([field], self.provider.fields()))])
+ self.assertEqual(result, expected, 'Expected {}, got {}'.format(expected, result))

View File

@@ -1,13 +0,0 @@
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})

View File

@@ -2,7 +2,7 @@
# It is not meant for productive use.
RewriteEngine on
RewriteRule ^/wms/(.*)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
RewriteRule ^/wms/(.+)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
ScriptAlias /qgis/ "/usr/libexec/qgis/"

164
qgis.spec
View File

@@ -4,18 +4,24 @@
# 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
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%if (0%{?rhel} <= 6 && !0%{?fedora})
%ifarch ppc ppc64
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE -D WITH_INTERNAL_SPATIALITE: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 6.4.4
#TODO: Run test suite (see debian/rules)
Name: qgis
Version: 2.18.16
Release: 2%{?dist}
Version: 2.14.3
Release: 3%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@@ -34,10 +40,6 @@ 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
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
Patch0: %{name}-lib64.patch
# Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see:
@@ -54,7 +56,7 @@ BuildRequires: fcgi-devel
BuildRequires: flex bison
BuildRequires: gdal-devel
BuildRequires: geos-devel
BuildRequires: grass-devel
BuildRequires: grass-devel = %{grass_version}
BuildRequires: gsl-devel
%ifarch ppc ppc64
@@ -76,9 +78,7 @@ 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
@@ -97,8 +97,6 @@ BuildRequires: sqlite-devel
#BuildRequires: xorg-x11-server-Xvfb
Requires: gpsbabel
# As found in BZ#1396818
Requires: qca-ossl
# We don't want to provide private Python extension libs
%if (0%{?fedora} || 0%{?rhel} > 6)
@@ -136,25 +134,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# The plug-in requires more than just the grass-libs.
# This questions the sense of the libs package.
# 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}
Requires: grass
%description grass
GRASS plugin for QGIS required to interface with the GRASS system.
%package -n python2-qgis
%{?python_provide:%python_provide python2-qgis}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
%package python
Summary: Python integration and plug-ins for QGIS
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: gdal-python
Requires: PyQt4-webkit
Requires: PyQt4
Requires: python-httplib2
Requires: python-jinja2
Requires: python-matplotlib
@@ -166,7 +156,7 @@ Requires: PyYAML
Requires: qscintilla-python
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
%description -n python2-qgis
%description python
Python integration and plug-ins for QGIS.
%package server
@@ -187,7 +177,6 @@ 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 {} \+
@@ -221,9 +210,11 @@ 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-7.4.0 \
-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 \
@@ -247,10 +238,7 @@ gzip ChangeLog
# Doesn't build, as of 2.10, known issue
#-D WITH_GLOBE:BOOL=TRUE
# Parallel build appears to occasionally result in build failures
# (UI form headers generated too late)
# TODO: Re-check with QGIS-3.0
make
make %{?_smp_mflags}
%install
@@ -311,6 +299,10 @@ 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
@@ -343,9 +335,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%postun grass -p /sbin/ldconfig
%post -n python2-qgis -p /sbin/ldconfig
%post python -p /sbin/ldconfig
%postun -n python2-qgis -p /sbin/ldconfig
%postun python -p /sbin/ldconfig
%files -f %{name}.lang
%doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
@@ -354,6 +346,9 @@ 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.*
@@ -395,7 +390,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/%{name}/grass/
%{_datadir}/%{name}/grass/
%files -n python2-qgis
%files python
%{_libdir}/libqgispython.so.*
%{_datadir}/%{name}/python/
%{python_sitearch}/%{name}/
@@ -413,107 +408,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Wed Jan 31 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-2
- Rebuild for GRASS 7.4
* Mon Jan 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-1
- New upstream release
* Sun Dec 10 2017 Daniele Viganò <daniele@vigano.me> - 2.18.15-1
- New upstream release
* Fri Oct 27 2017 Daniele Viganò <daniele@vigano.me> - 2.18.14-1
- New upstream release
* Mon Sep 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.13-2
- Remove SIP-4.19-related patch
* Mon Sep 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.13-1
- New upstream release
* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1
- Add patch to solve SIP-4.19-related build failure
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.18.11-4
- Python 2 binary package renamed to python2-qgis
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Tue Jul 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.11-1
- New upstream release
* Mon Jul 17 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-6
- Rebuild for F26 GA
- Sync with Fedora upstream http://pkgs.fedoraproject.org/cgit/rpms/qgis.git
* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-2
- Limit maximum number of concurrent make
* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-1
- Fix an issue in the QGIS server httpd configuration
- New upstream release
* Mon May 29 2017 Daniele Viganò <daniele@vigano.me> - 2.18.9-1
- New upstream release
* Mon May 22 2017 Daniele Viganò <daniele@vigano.me> - 2.18.8-1
- New upstream release
* Wed Apr 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.7-1
- New upstream release
* Sun Apr 09 2017 Daniele Viganò <daniele@vigano.me> - 2.18.6-2
- Fix F26 builds
* Sun Apr 09 2017 Daniele Viganò <daniele@vigano.me> - 2.18.6-1
- New upstream release
* Fri Apr 07 2017 Daniele Viganò <daniele@vigano.me> - 2.18.5-2
- Build for F26
* Mon Mar 27 2017 Daniele Viganò <daniele@vigano.me> - 2.18.5-1
- New upstream release
* Wed Mar 01 2017 Sandro Mani <manisandro@gmail.com> - 2.18.4-2
- Add patch to fix FTBFS
* Wed Mar 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.4-1
- New upstream release
* Wed Feb 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.3-1
- New upstream release
* Fri Dec 16 2016 Volker Froehlich <volker27@gmx.at> - 2.18.2-1
- New upstream release
* Sat Nov 26 2016 Volker Froehlich <volker27@gmx.at> - 2.18.1-1
- New upstream release
* Sun Nov 20 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-2
- Add qca-ossl to Requires, as of BZ#1396818
* Fri Oct 21 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-1
- New upstream release
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.3-1
- Update to 2.16.3
- Add patch to fix qreal usage on arm
* Mon Sep 26 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
* Thu Aug 11 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-5
- Replace dependency on PyQt4 with PyQt4-webkit, since webkit
is in a sub-package now (BZ #1360485)
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14.3-4
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Tue Jun 07 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-3
- Version bump to be newer than F24

1
saga/.gitignore vendored
View File

@@ -1 +0,0 @@
saga_2.3.1_gpl2.tar.gz

View File

@@ -1,135 +0,0 @@
From f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3 Mon Sep 17 00:00:00 2001
Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3/
From: oconrad <conrad@geowiss.uni-hamburg.de>
Date: Thu, 18 Aug 2016 13:01:36 +0200
Subject: saga_api, CSG_MetaData, gcc v6 compatibility: is_valid() function
removed (you can use () operator to check if a child entry with given name
exists)
diff --git a/saga-gis/src/saga_core/saga_api/metadata.cpp b/saga-gis/src/saga_core/saga_api/metadata.cpp
index 030be0c..4e2f135 100644
--- a/src/saga_core/saga_api/metadata.cpp
+++ b/src/saga_core/saga_api/metadata.cpp
@@ -174,17 +174,6 @@ void CSG_MetaData::Destroy(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-bool CSG_MetaData::is_Valid(void) const
-{
- return( this != NULL );
-}
-
-
-///////////////////////////////////////////////////////////
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
CSG_MetaData * CSG_MetaData::Add_Child(void)
{
return( Ins_Child(-1) );
diff --git a/saga-gis/src/saga_core/saga_api/metadata.h b/saga-gis/src/saga_core/saga_api/metadata.h
index 905a668..858be49 100644
--- a/src/saga_core/saga_api/metadata.h
+++ b/src/saga_core/saga_api/metadata.h
@@ -157,8 +157,6 @@ public:
const CSG_MetaData & operator [] (int Index) const { return( *Get_Child(Index ) ); }
const CSG_MetaData & operator [] (const CSG_String &Name) const { return( *Get_Child(_Get_Child(Name)) ); }
- bool is_Valid (void) const;
-
int Get_Property_Count (void) const { return( m_Prop_Names.Get_Count() ); }
const CSG_String & Get_Property_Name (int i) const { return( m_Prop_Names [i] ); }
const SG_Char * Get_Property (int i) const { return( i >= 0 && i < m_Prop_Values.Get_Count() ? m_Prop_Values[i].c_str() : NULL ); }
diff --git a/saga-gis/src/saga_core/saga_api/projections.cpp b/saga-gis/src/saga_core/saga_api/projections.cpp
index d84d386..638c0da 100644
--- a/src/saga_core/saga_api/projections.cpp
+++ b/src/saga_core/saga_api/projections.cpp
@@ -220,7 +220,7 @@ double SG_Get_Projection_Unit_To_Meter (TSG_Projection_Unit Unit)
//---------------------------------------------------------
bool SG_Set_Projection_Unit (const CSG_MetaData &m, TSG_Projection_Unit &Unit, CSG_String &Name, double &To_Meter)
{
- if( m["UNIT"].is_Valid() )
+ if( m("UNIT") )
{
if( m["UNIT"].Get_Property("name", Name) && (Unit = SG_Get_Projection_Unit(Name)) != SG_PROJ_UNIT_Undefined )
{
@@ -1042,8 +1042,8 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
// ]
if( !m.Get_Name().Cmp("GEOGCS") )
{
- if( !m["DATUM"].is_Valid()
- || !m["DATUM"]["SPHEROID"].is_Valid()
+ if( !m("DATUM")
+ || !m["DATUM"]("SPHEROID")
|| m["DATUM"]["SPHEROID"].Get_Children_Count() != 2
|| !m["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
|| !m["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d < 0.0 )
@@ -1056,7 +1056,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
Proj4 += CSG_String::Format(SG_T(" +a=%f"), a); // Semimajor radius of the ellipsoid axis
Proj4 += CSG_String::Format(SG_T(" +b=%f"), d > 0.0 ? a - a / d : a); // Semiminor radius of the ellipsoid axis
- if( m["DATUM"]["TOWGS84"].is_Valid() && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
+ if( m["DATUM"]("TOWGS84") && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
{
for(i=0; i<7; i++)
{
@@ -1064,7 +1064,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
}
}
- if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
+ if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
{
Proj4 += CSG_String::Format(SG_T(" +pm=%f"), d);
}
@@ -1090,7 +1090,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
// ]
if( !m.Get_Name().Cmp(SG_T("PROJCS")) )
{
- if( !m["PROJECTION"].is_Valid() )
+ if( !m("PROJECTION") )
{
SG_UI_Msg_Add_Error(CSG_String::Format(SG_T(">> WKT: %s"), _TL("no projection specified")));
@@ -1104,9 +1104,9 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
return( false );
}
- if( !m["GEOGCS"].is_Valid()
- || !m["GEOGCS"]["DATUM"].is_Valid()
- || !m["GEOGCS"]["DATUM"]["SPHEROID"].is_Valid()
+ if( !m("GEOGCS")
+ || !m["GEOGCS"]("DATUM")
+ || !m["GEOGCS"]["DATUM"]("SPHEROID")
|| m["GEOGCS"]["DATUM"]["SPHEROID"].Get_Children_Count() != 2
|| !m["GEOGCS"]["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
|| !m["GEOGCS"]["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d < 0.0 )
@@ -1121,7 +1121,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
Proj4 += CSG_String::Format(SG_T(" +a=%f"), a);
Proj4 += CSG_String::Format(SG_T(" +b=%f"), d <= 0.0 ? a : a - a / d); // Semiminor radius of the ellipsoid axis
- if( m["GEOGCS"]["DATUM"]["TOWGS84"].is_Valid() && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
+ if( m["GEOGCS"]["DATUM"]("TOWGS84") && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
{
for(i=0; i<7; i++)
{
@@ -1129,7 +1129,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
}
}
- if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
+ if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
{
Proj4 += CSG_String::Format(SG_T(" +pm=%f"), d);
}
@@ -1149,7 +1149,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
}
}
- if( m["UNIT"].is_Valid() && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
+ if( m("UNIT") && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
{
Proj4 += CSG_String::Format(SG_T(" +to_meter=%f"), d);
}

View File

@@ -1,132 +0,0 @@
Description: Fix spelling errors.
* minium -> minimum
* coodinate -> coordinate
* contributers -> contributors
* ins't -> isn't
* Internation -> International
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: https://sourceforge.net/p/saga-gis/patches/15/
Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/ed0361f4a2d25ac727cc184ceaca3125ef6c7dfe/
https://sourceforge.net/p/saga-gis/code/ci/450e5927b0b0759d23b8b31258cc431e9d5aa844/
--- a/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp
+++ b/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp
@@ -190,7 +190,7 @@ CFilter_Multi_Dir_Lee::CFilter_Multi_Dir
Set_Author(_TL("Copyrights (c) 2003 by Andre Ringeler"));
Set_Description (_TW(
- "The module searches for the minium variance within 16 directions "
+ "The module searches for the minimum variance within 16 directions "
"and applies a Lee Filter in the direction of minimum variance. The "
"filter is edge-preserving and can be used to remove speckle noise "
"from SAR images or to smooth DTMs. Applied to DTMs, this filter "
--- a/src/modules/terrain_analysis/ta_hydrology/Flow_RecursiveDown.cpp
+++ b/src/modules/terrain_analysis/ta_hydrology/Flow_RecursiveDown.cpp
@@ -128,7 +128,7 @@ CFlow_RecursiveDown::CFlow_RecursiveDown
Parameters.Add_Value(
NULL , "MINDQV" , _TL("DEMON - Min. DQV"),
- _TL("DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes"),
+ _TL("DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes"),
PARAMETER_TYPE_Double , 0.0, 0.0, true, 1.0, true
);
--- a/src/saga_core/saga_gui/res/saga.bra.txt
+++ b/src/saga_core/saga_gui/res/saga.bra.txt
@@ -1216,7 +1216,7 @@ TEXT TRANSLATION
"DEM without Sinks" "MDE sem skins"
"DEMON" "DEMON"
"DEMON - Min. DQV" "DEMON - Min. DQV"
-"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Volume m<>nimo de drenagem do contigente (DQV) para tubos de fluxo rastreados"
+"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Volume m<>nimo de drenagem do contigente (DQV) para tubos de fluxo rastreados"
"DESCRIPTION" "Descri<72><69>o"
"DIFF_MEAN" "DIFF_MEAN"
"DN" "DN"
--- a/src/saga_core/saga_gui/res/saga.ger.txt
+++ b/src/saga_core/saga_gui/res/saga.ger.txt
@@ -1216,7 +1216,7 @@ TEXT TRANSLATION
"DEM without Sinks" ""
"DEMON" "DEMON"
"DEMON - Min. DQV" ""
-"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Minimales Abflussquotenvolumen (DQV) f<>r aufgezeichnete Flie<69>r<EFBFBD>hren"
+"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Minimales Abflussquotenvolumen (DQV) f<>r aufgezeichnete Flie<69>r<EFBFBD>hren"
"DESCRIPTION" "BESCHREIBUNG"
"DIFF_MEAN" "DIFFERENZ_DURCHSCHNITT"
"DN" ""
--- a/src/saga_core/saga_gui/res/saga.lng.txt
+++ b/src/saga_core/saga_gui/res/saga.lng.txt
@@ -1216,7 +1216,7 @@ TEXT TRANSLATION
"DEM without Sinks" ""
"DEMON" ""
"DEMON - Min. DQV" ""
-"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes" ""
+"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes" ""
"DESCRIPTION" ""
"DIFF_MEAN" ""
"DN" ""
--- a/src/modules/projection/pj_proj4/crs_grid_geogcoords.cpp
+++ b/src/modules/projection/pj_proj4/crs_grid_geogcoords.cpp
@@ -79,7 +79,7 @@ CCRS_Grid_GeogCoords::CCRS_Grid_GeogCoor
Set_Description (_TW(
"Creates for a given grid geographic coordinate information, "
"i.e. two grids specifying the longitude and latitude for each cell. "
- "The coodinate system of the input grid has to be defined. "
+ "The coordinate system of the input grid has to be defined. "
));
Set_Description (Get_Description() + "\n" + CSG_CRSProjector::Get_Description());
--- a/src/saga_core/saga_cmd/man/saga_cmd.1
+++ b/src/saga_core/saga_cmd/man/saga_cmd.1
@@ -221,7 +221,7 @@ Multiple input files can be specified by
On the website of \fIhttp://www.saga\-gis.org\fR, a list of known bugs can be found and new bug reports can be submitted.
.SH "AUTHORS"
.IX Header "AUTHORS"
-\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributers. This manual page was written by Johan Van de Wauw.
+\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributors. This manual page was written by Johan Van de Wauw.
Both are released under the \s-1GNU\s0 General Public License v2.
.PP
More info \fIhttp://www.saga\-gis.org\fR
--- a/src/saga_core/saga_gui/man/saga_gui.1
+++ b/src/saga_core/saga_gui/man/saga_gui.1
@@ -142,7 +142,7 @@ Graphical user interface to the System f
On the project website: \fIhttp://www.saga\-gis.org\fR, a list of known bugs can be found and new bug reports can be submitted.
.SH "AUTHORS"
.IX Header "AUTHORS"
-\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributers. This manual page was written by Johan Van de Wauw.
+\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributors. This manual page was written by Johan Van de Wauw.
Both are released under the \s-1GNU\s0 General Public License v2.
.PP
More info \fIhttp://www.saga\-gis.org\fR
--- a/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.cpp
+++ b/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.cpp
@@ -91,7 +91,7 @@ CPC_Reclass_Extract::CPC_Reclass_Extract
"In addition to these settings, two special cases ('NoData values' and 'other values' not "
"included in the parameter setup) are supported:\n"
"In mode (a) and (b) the 'NoData option' is evaluated before the method settings, in mode "
- "(c) the option is evaluated only if the NoData value ins't included in the lookup table.\n"
+ "(c) the option is evaluated only if the NoData value isn't included in the lookup table.\n"
"The 'other values' option is always evaluated after checking the method settings.\n\n")
);
--- a/src/saga_core/saga_api/projections.cpp
+++ b/src/saga_core/saga_api/projections.cpp
@@ -1639,7 +1639,7 @@ bool CSG_Projections::_Set_Dictionary(CS
{ "hammer" , " ", "Hammer_Eckert_Greifendorff" , "*) Hammer & Eckert-Greifendorff" },
{ "hatano" , " ", "Hatano_Asymmetrical_Equal_Area" , "*) Hatano Asymmetrical Equal Area" },
{ "igh" , " ", "World_Goode_Homolosine_Land" , "*) Interrupted Goode Homolosine" },
- { "imw_p" , " ", "Internation_Map_of_the_World_Polyconic" , "*) Internation Map of the World Polyconic" },
+ { "imw_p" , " ", "International_Map_of_the_World_Polyconic" , "*) International Map of the World Polyconic" },
{ "kav5" , " ", "Kavraisky_V" , "*) Kavraisky V" },
{ "kav7" , " ", "Kavraisky_VII" , "*) Kavraisky VII" },
{ "krovak" , " ", "Krovak" , "Krovak" },
--- a/src/saga_core/saga_gui/res/saga_dic.txt
+++ b/src/saga_core/saga_gui/res/saga_dic.txt
@@ -50,7 +50,7 @@ PROJ4 DIR WKT DESC
"hammer" " " "Hammer_Eckert_Greifendorff" "*) Hammer & Eckert-Greifendorff"
"hatano" " " "Hatano_Asymmetrical_Equal_Area" "*) Hatano Asymmetrical Equal Area"
"igh" " " "Interrupted_Goodes_Homolosine" "*) Interrupted Goode's Homolosine"
-"imw_p" " " "Internation_Map_of_the_World_Polyconic" "*) Internation Map of the World Polyconic"
+"imw_p" " " "International_Map_of_the_World_Polyconic" "*) International Map of the World Polyconic"
"kav5" " " "Kavraisky_V" "*) Kavraisky V"
"kav7" " " "Kavraisky_VII" "*) Kavraisky VII"
"krovak" " " "Krovak" "Krovak"

View File

@@ -1,320 +0,0 @@
Name: saga
Version: 2.3.1
Release: 3%{?dist}
Summary: Geographic information system with an API for processing geodata
Group: Applications/Engineering
# libsaga_api is licensed under the terms of LGPLv2. So is one single
# module and some of the code to create documentation.
# The rest of the code is GPLv2, GPLv2+ or compatible (ISC, MIT/X11)
License: GPLv2 and LGPLv2
URL: http://www.saga-gis.org
#Source0: https://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.3/SAGA%20%{version}/saga_%{version}_gpl2.tar.gz
Source0: %{name}_%{version}_gpl2.tar.gz
Patch0: %{name}-projections-gcc6.patch
Patch1: %{name}-spelling-errors.patch
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
BuildRequires: libtool automake autoconf
BuildRequires: e00compr-static
BuildRequires: gdal-devel
BuildRequires: jasper-devel
BuildRequires: libharu-devel
BuildRequires: libsvm-devel
BuildRequires: libtiff-devel
BuildRequires: polyclipping-devel
BuildRequires: proj-devel
BuildRequires: postgresql-devel
BuildRequires: python2-devel
BuildRequires: qhull-devel
BuildRequires: swig
BuildRequires: unixODBC-devel
#BuildRequires: vigra-devel
BuildRequires: wxGTK3-devel
%description
SAGA is a geographic information system (GIS) with a special API
for geographic data processing. This API makes it easy to implement
new algorithms. The SAGA API supports grid data, vector data, and tables.
%package -n python2-saga
%{?python_provide:%python_provide python2-saga}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: SAGA Python interface
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python2-saga
Python interface for SAGA
%package devel
Summary: SAGA development package
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package includes the headers and development libraries for SAGA.
# We don't want to provide private Python extension libs
# This approach only works with rpm 4.9
# See https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage and https://fedorahosted.org/fpc/ticket/76
#TODO: Check if provides are proper
%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
%global __provides_requires_from ^%{python_sitearch}/.*\.so$
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
# Convert to UNIX line-breaks
sed -i 's/\r//' AUTHORS
gzip -c ChangeLog > ChangeLog.gz
%if 0%{?fedora} > 24
# Installation directory has changed
sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
src/modules/grid/grid_gridding/nn/delaunay.c
%endif
%build
# wxGTK3 3.0.1-3 moved wx-config to libexecdir
PATH=$PATH:%{_libexecdir}/wxGTK3/
autoreconf -fi
#TODO: openmp?
# Build without non-free components
%configure \
--disable-static \
--enable-python \
--disable-libfire \
--disable-triangle
# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
# -Wl,--as-needed after all the libraries.
sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-e 's|^LTCC="gcc"|LTCC="gcc -Wl,--as-needed"|' \
-e 's|^CC="g++"|CC="g++ -Wl,--as-needed"|' \
-i libtool
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
# Drop libtool archives
rm -rf %{buildroot}/%{_libdir}/saga/lib*.la \
%{buildroot}/%{_libdir}/saga/libsaga_*.la
rm -rf %{buildroot}/%{python_sitearch}/*.la \
%{buildroot}/%{_libdir}/*.la
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
%files
%doc AUTHORS COPYING README
%{_bindir}/%{name}_cmd
%{_bindir}/%{name}_gui
%{_libdir}/%{name}/
%{_datadir}/%{name}/
# No soname versioning is yet in place and the interfaces are not stable
%{_libdir}/lib%{name}_api-%{version}.so
%{_libdir}/lib%{name}_gdi-%{version}.so
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/appdata/%{name}.appdata.xml
%{_mandir}/man1/%{name}_*1*
%files -n python2-saga
%{python2_sitearch}/*.py*
%{python2_sitearch}/*.so
%files devel
%{_includedir}/%{name}/
%{_libdir}/lib%{name}_api.so
%{_libdir}/lib%{name}_gdi.so
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%changelog
* Thu Jan 18 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-3
- Add from Debian to address segfaults with shapefiles and newer GCC
- Add a patch from Debian to fix spelling
* Tue Aug 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-2
- Sync with upstream master
- Python 2 binary package renamed to python2-saga
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Thu Jun 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-1
- Update to SAGA 2.3.1 (with some non-free components disabled)
* Tue Feb 21 2017 Volker Froehlich <volker27@gmx.at> - 2.2.7-3
- Temporarily remove vigra support, due to build failure
* Tue Jan 31 2017 Volker Froehlich <volker27@gmx.at> - 2.2.7-2
- Rebuild for libproj
* Fri Oct 14 2016 Volker Froehlich <volker27@gmx.at> - 2.2.7-1
- New upstream release
- Add new icons to file list
- Add svm patch from Ubuntugis
- Remove references to g2clib
* Thu Oct 13 2016 Volker Froehlich <volker27@gmx.at> - 2.2.4-4
- Rebuild for polyclipping 6.4
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-3
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Fri Apr 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.2.4-2
- Rebuild for qhull-2015.2-1.
- Reflect qhull_a.h's location having changed.
* Sat Mar 12 2016 Volker Froehlich <volker27@gmx.at> - 2.2.4-1
- New upstream release
- Use the new build options to get rid of triangle, libfire and grib2c
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Oct 16 2015 Volker Froehlich <volker27@gmx.at> - 2.2.2-1
- New upstream release
* Fri Sep 25 2015 Volker Froehlich <volker27@gmx.at> - 2.2.1-1
- New upstream release
* Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.2.0-2
- Rebuild for GDAL 2.0
* Sat Jul 4 2015 Volker Froehlich <volker27@gmx.at> - 2.2.0-1
- New upstream version
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.4-4
- Rebuilt for GCC 5 C++11 ABI change
* Thu Mar 26 2015 Orion Poplawski <orion@cora.nwra.com> - 2.1.4-3
- Fix up removing bundled source
* Sat Mar 14 2015 Volker Froehlich <volker27@gmx.at> - 2.1.4-2
- Rebuild for Proj 4.1.9
* Fri Nov 14 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.4-1
- New upstream release
- Update dxflib patch
* Fri Oct 31 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.3-1
- New upstream release
- Remove ChangeLog, as it is not updated, ship README instead
- Add and validate appdata file
- Remove format patch (solved upstream)
* Wed Oct 22 2014 Volker Froehlich <volker27@gmx.at> - 2.1.2-5
- Rebuild for polyclipping 6.2.0
* Tue Oct 14 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.2-4
- Adapt package to new file layout in wxGTK3 3.0.1-3 (F22)
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu May 15 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.2-1
- New upstream release
* Thu Feb 13 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.1-1
- New upstream release
- Compress changelog file
- Adjust to using wxGTK3, thus drop propgrid dependency as it is included
- Drop outdated build options
- Adapt to polyclipping 6.1 API
- Add BR for postgresql-devel
- Drop custom desktop file and use png icon
- Remove odbc headers from devel package, as discussed with Volker Wichmann
- Add complementary requires-filtering
* Sat Jan 18 2014 Volker Fröhlich <volker27@gmx.at> - 2.0.8-14
- Use safe printing format, solve BZ #1037315 and upstream bug #163
- Add patch for vigra 1.10.0 (upstream bug #173)
* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 2.0.8-13
- Rebuild for gdal 1.10.0
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jun 24 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-11
- Rebuild for polyclipping 5.1.6
* Mon Mar 4 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-10
- Rebuild for polyclipping 5.1.2
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Jan 8 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-8
- Rebuild for polyclipping
* Wed Dec 26 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-7
- Rebuild for polyclipping
* Fri Nov 23 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-6
- Rebuild for polyclipping
* Fri Oct 19 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-5
- Correct isa macros
- No later versions of GPL and LGPL are allowed
- Break down licenses
- Solve the rpath issue differently
- Rename patches and change numbering
* Tue Oct 9 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-4
- Remove draft patch breaking the build
* Sun Oct 7 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-3
- Replace provides-filtering with a suitable method
- Replace dos2unix invocation with sed
* Thu Apr 12 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-2
- Build with system-wide wxpropgrid and polyclipping
- Correct Exec entry in the desktop file
- Update patch for e00compr
* Thu Nov 24 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.8-1
- Updated for new version
- Drop obsolete patches gcc46 and python-parallel
- Correct tarball script
- Update and correct linking in g2clib patch
* Sun Oct 30 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-3
- Delete dxflib from tarball
- Split patches for dxflib and e00compr
- Use bundled wxpropgrid for the time being
- Use system-wide e00compr
* Fri Oct 07 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-2
- Correct g2clib patch to actually use g2clib
- Only link to libraries actually used
- Fix configure.in to really search for lodbc
- Require g2clib-static instead of -devel
* Fri Sep 09 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-1
- Initital package

View File

@@ -1 +0,0 @@
SHA512 (saga_2.3.1_gpl2.tar.gz) = 5036c6049e0d02b473f8c778aa44adfe769faa8504c3455f86e0b8d8f0ad831801fa2e5073eac786fbd1fc5a64157a0c8981fb551ab36136e2228cf0397d5079

View File

@@ -1 +1 @@
SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
8598c7bbe47d3b88c0df5524589d2cb0 qgis-2.14.3.tar.bz2