Merge branch 'master' into f21
Conflicts: gdal.spec
This commit is contained in:
commit
41f375186a
2
.gitignore
vendored
2
.gitignore
vendored
@ -11,3 +11,5 @@ gdalautotest-1.7.0.tar.gz
|
||||
/gdalautotest-1.10.1.tar.gz
|
||||
/gdal-1.11.0-fedora.tar.xz
|
||||
/gdalautotest-1.11.0.tar.gz
|
||||
/gdal-1.11.1-fedora.tar.xz
|
||||
/gdalautotest-1.11.1.tar.gz
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# Volker Fröhlich
|
||||
VERSION="1.11.0"
|
||||
VERSION="1.11.1"
|
||||
|
||||
tar xvf gdal-"${VERSION}".tar.xz
|
||||
|
||||
|
12
gdal.spec
12
gdal.spec
@ -23,7 +23,7 @@
|
||||
|
||||
|
||||
# Tests can be of a different version
|
||||
%global testversion 1.11.0
|
||||
%global testversion 1.11.1
|
||||
%global run_tests 1
|
||||
|
||||
%global with_spatialite 1
|
||||
@ -40,8 +40,8 @@
|
||||
|
||||
|
||||
Name: gdal
|
||||
Version: 1.11.0
|
||||
Release: 7%{?dist}
|
||||
Version: 1.11.1
|
||||
Release: 1%{?dist}
|
||||
Summary: GIS file format library
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
@ -50,7 +50,7 @@ URL: http://www.gdal.org
|
||||
# See PROVENANCE.TXT-fedora and the cleaner script for details!
|
||||
|
||||
Source0: %{name}-%{version}-fedora.tar.xz
|
||||
Source1: http://download.osgeo.org/%{name}/%{name}autotest-%{testversion}.tar.gz
|
||||
Source1: http://download.osgeo.org/%{name}/%{testversion}/%{name}autotest-%{testversion}.tar.gz
|
||||
Source2: %{name}.pom
|
||||
|
||||
# Cleaner script for the tarball
|
||||
@ -763,6 +763,10 @@ popd
|
||||
#Or as before, using ldconfig
|
||||
|
||||
%changelog
|
||||
* Thu Oct 2 2014 Volker Fröhlich <volker27@gmx.at> - 1.11.1-1
|
||||
- New release
|
||||
- Correct test suite source URL
|
||||
|
||||
* Fri Sep 19 2014 Volker Fröhlich <volker27@gmx.at> - 1.11.0-7
|
||||
- Add aarch64 to gdal-config script (BZ#1129295)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user