- a new bugfix upstream
- drop gcc43 patch - more license cleaned ---------------------------------------------------------------------- Modified Files: devel/.cvsignore devel/gdal.spec devel/sources Added Files: devel/import.log Removed Files: devel/gdal-gcc43.patch ----------------------------------------------------------------------
This commit is contained in:
parent
7d5eff66d5
commit
5284e25807
|
@ -1,2 +1,2 @@
|
|||
gdal-1.5.1-fedora.tar.gz
|
||||
gdalautotest-1.5.0.tar.gz
|
||||
gdal-1.5.2-fedora.tar.gz
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
--- ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp.orig 2008-02-14 02:43:16.000000000 +0200
|
||||
+++ ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp 2008-02-14 13:21:22.000000000 +0200
|
||||
@@ -26,10 +26,11 @@
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
+#include <algorithm> // for_each, find_if
|
||||
+
|
||||
#include "ogr_geojson.h"
|
||||
#include "ogrgeojsonwriter.h"
|
||||
#include <jsonc/json.h> // JSON-C
|
||||
-#include <algorithm> // for_each, find_if
|
||||
|
||||
/************************************************************************/
|
||||
/* STATIC MEMBERS DEFINITION */
|
21
gdal.spec
21
gdal.spec
|
@ -1,15 +1,14 @@
|
|||
Name: gdal
|
||||
Version: 1.5.1
|
||||
Release: 13%{?dist}
|
||||
Version: 1.5.2
|
||||
Release: 1%{?dist}
|
||||
Summary: GIS file format library
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
URL: http://www.gdal.org/
|
||||
Source0: %{name}-%{version}-fedora.tar.gz
|
||||
Source1: http://download.osgeo.org/gdal/gdalautotest-1.5.0.tar.gz
|
||||
Patch0: %{name}-gcc43.patch
|
||||
Patch1: %{name}-perl510.patch
|
||||
Patch2: %{name}-sincos.patch
|
||||
Patch0: %{name}-perl510.patch
|
||||
Patch1: %{name}-sincos.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libtool pkgconfig
|
||||
BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
|
||||
|
@ -25,7 +24,7 @@ BuildRequires: ant swig ruby java-devel
|
|||
%endif
|
||||
|
||||
# enable/disable grass support, for bootstrapping
|
||||
%define grass_support 0
|
||||
%define grass_support 1
|
||||
# enable/disable refman generation
|
||||
%define build_refman 1
|
||||
|
||||
|
@ -94,9 +93,8 @@ The GDAL java modules provides support to handle multiple GIS file formats.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-fedora
|
||||
%patch0 -p0 -b .gcc43~
|
||||
%patch1 -p0 -b .perl510~
|
||||
%patch2 -p0 -b .sincos~
|
||||
%patch0 -p0 -b .perl510~
|
||||
%patch1 -p0 -b .sincos~
|
||||
|
||||
# unpack test cases olso.
|
||||
tar -xzf %{SOURCE1} .
|
||||
|
@ -520,6 +518,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jun 12 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.2-1
|
||||
- a new bugfix upstream
|
||||
- drop gcc43 patch
|
||||
- more license cleaned
|
||||
|
||||
* Wed May 27 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-13
|
||||
- fix pkgconfig too
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
gdal-1_5_2-1_fc9:HEAD:gdal-1.5.2-1.fc9.src.rpm:1213299145
|
Loading…
Reference in New Issue