diff --git a/.cvsignore b/.cvsignore index fbb873c..9bf0d89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -gdal-1.5.2-fedora.tar.gz gdalautotest-1.5.0.tar.gz +gdal-1.5.3-fedora.tar.gz diff --git a/gdal-perl510.patch b/gdal-perl510.patch deleted file mode 100644 index 91df75f..0000000 --- a/gdal-perl510.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- swig/perl/gdal_wrap.cpp.orig 2008-03-25 20:19:03.000000000 +0200 -+++ swig/perl/gdal_wrap.cpp 2008-03-25 20:19:52.000000000 +0200 -@@ -1228,8 +1228,11 @@ - /* Macros for low-level exception handling */ - #define SWIG_croak(x) { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; } - -+#ifndef XSPROTO -+# define XSPROTO(name) void name(pTHX_ CV* cv) -+#endif - --typedef XS(SwigPerlWrapper); -+typedef XSPROTO(SwigPerlWrapper); - typedef SwigPerlWrapper *SwigPerlWrapperPtr; - - /* Structure for command table */ ---- swig/perl/ogr_wrap.cpp.orig 2008-03-25 20:45:42.000000000 +0200 -+++ swig/perl/ogr_wrap.cpp 2008-03-25 20:48:00.000000000 +0200 -@@ -1228,8 +1228,11 @@ - /* Macros for low-level exception handling */ - #define SWIG_croak(x) { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; } - -+#ifndef XSPROTO -+# define XSPROTO(name) void name(pTHX_ CV* cv) -+#endif - --typedef XS(SwigPerlWrapper); -+typedef XSPROTO(SwigPerlWrapper); - typedef SwigPerlWrapper *SwigPerlWrapperPtr; - - /* Structure for command table */ ---- swig/perl/osr_wrap.cpp.orig 2008-03-25 20:49:16.000000000 +0200 -+++ swig/perl/osr_wrap.cpp 2008-03-25 20:49:33.000000000 +0200 -@@ -1229,7 +1229,11 @@ - #define SWIG_croak(x) { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; } - - --typedef XS(SwigPerlWrapper); -+#ifndef XSPROTO -+# define XSPROTO(name) void name(pTHX_ CV* cv) -+#endif -+ -+typedef XSPROTO(SwigPerlWrapper); - typedef SwigPerlWrapper *SwigPerlWrapperPtr; - - /* Structure for command table */ diff --git a/gdal-sincos.patch b/gdal-sincos.patch deleted file mode 100644 index 1a6f703..0000000 --- a/gdal-sincos.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- frmts/hdf4/hdf-eos/GDapi.c.orig 2008-05-20 15:01:09.000000000 +0300 -+++ frmts/hdf4/hdf-eos/GDapi.c 2008-05-20 15:02:07.000000000 +0300 -@@ -6258,7 +6258,7 @@ - - - --#if !defined(HP9000) && !defined(DEC_ALPHA) -+#if 0 - void - sincos(double val, double *sin_val, double *cos_val) - { diff --git a/gdal.spec b/gdal.spec index 56cf799..2a10880 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,15 +1,13 @@ Name: gdal -Version: 1.5.2 -Release: 4%{?dist} +Version: 1.5.3 +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}-perl510.patch -Patch1: %{name}-sincos.patch -Patch2: %{name}-libdap.patch +Patch0: %{name}-libdap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool pkgconfig BuildRequires: python-devel numpy xerces-c-devel @@ -56,6 +54,13 @@ Requires: %{name} = %{version}-%{release} %description devel The GDAL library provides support to handle multiple GIS file formats. +%package static +Summary: Static Development Libraries for the GDAL file format library +Group: Development/Libraries + +%description static +The GDAL library provides support to handle multiple GIS file formats. + %package python Summary: Python modules for the GDAL file format library Group: Development/Libraries @@ -95,9 +100,9 @@ The GDAL java modules provides support to handle multiple GIS file formats. %prep %setup -q -n %{name}-%{version}-fedora -%patch0 -p0 -b .perl510~ -%patch1 -p0 -b .sincos~ -%patch2 -p1 -b .libdap~ +%if "%{?dist}" == ".fc10" +%patch0 -p1 -b .libdap~ +%endif # unpack test cases olso. tar -xzf %{SOURCE1} . @@ -222,7 +227,6 @@ export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / -fPIC -D %if %{grass_support} --with-libgrass \ --with-grass=%{_prefix} \ - --disable-static %endif # fixup hardcoded wrong compile flags. @@ -255,7 +259,7 @@ popd pushd swig/java make generate # disable ColorEntry for now (gdal Ticket: #2331) -rm -rf org/gdal/gdal/ColorEntry.java +rm -rf org/gdal/gdal/ColorTable.java make build popd %endif @@ -296,6 +300,9 @@ cat GNUmakefile | grep -v "\$(INSTALL_DIR) \$(DESTDIR)\$(INST_INCLUDE)" | \ grep -v "\$(INSTALL_DIR) \$(DESTDIR)\$(INST_DATA)" \ > GNUmakefile.tmp; mv -f GNUmakefile.tmp GNUmakefile +# fix python installation path +sed -i 's|setup.py install|setup.py install --root=%{buildroot}|' swig/python/GNUmakefile + make DESTDIR=%{buildroot} \ install @@ -333,7 +340,7 @@ mkdir -p docs/docs-%{cpuarch}/pdf pushd docs/docs-%{cpuarch}/pdf; mkdir -p br ru en ogr ogrsf_frmts/dgn frmts/gxf frmts/sdts frmts/iso8211 ; popd install -p -m 644 doc/latex/refman.pdf docs/docs-%{cpuarch}/pdf/en install -p -m 644 doc/br/latex/refman.pdf docs/docs-%{cpuarch}/pdf/br/ -install -p -m 644 doc/ru/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ru/ +#install -p -m 644 doc/ru/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ru/ install -p -m 644 latex/refman.pdf docs/docs-%{cpuarch}/refman.pdf install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/ install -p -m 644 ogr/ogrsf_frmts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/ @@ -412,7 +419,7 @@ touch -r NEWS %{buildroot}%{_bindir}/%{name}-config # cleanup junks rm -rf %{buildroot}%{_includedir}/%{name}/%{name} -for junk in {*.a,*.la,*.bs,.exists,.packlist,.cvsignore} ; do +for junk in {*.la,*.bs,.exists,.packlist,.cvsignore} ; do find %{buildroot} -name "$junk" -exec rm -rf '{}' \; done @@ -461,6 +468,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gdaltransform %{_bindir}/nearblack %{_bindir}/ogr* +%{_bindir}/testepsg %{_libdir}/*.so.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* @@ -490,6 +498,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %{_mandir}/man1/%{name}-config* +%files static +%defattr(-,root,root,-) +%{_libdir}/*.a + %files python %defattr(-,root,root,-) %doc swig/python/samples @@ -521,6 +533,12 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Oct 24 2008 Balint Cristian - 1.5.3-1 +- new stable +- ship static package too +- fix some doc generation +- libdap patch for fc10 only + * Tue Sep 30 2008 Balint Cristian - 1.5.2-4 - enable gdal_array for python subpackage - require numpy diff --git a/import.log b/import.log index 8b5178d..78ef956 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ gdal-1_5_2-1_fc9:HEAD:gdal-1.5.2-1.fc9.src.rpm:1213299145 gdal-1_5_2-4_fc10:HEAD:gdal-1.5.2-4.fc10.src.rpm:1222777883 +gdal-1_5_3-1_fc10:HEAD:gdal-1.5.3-1.fc10.src.rpm:1224848682 diff --git a/sources b/sources index 233abd2..8f7f3bc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b032dc858b5af1246023863317230701 gdal-1.5.2-fedora.tar.gz e8a9a020f086a4ed977b30921785006f gdalautotest-1.5.0.tar.gz +cbd6bb3273bdb9a86d1ec0d2a07efe5b gdal-1.5.3-fedora.tar.gz