rpms/gdal/devel import.log,NONE,1.1 gdal.spec,1.45,1.46

[Balint Cristian (rezso)]

Author: rezso

Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16032/devel

Modified Files:
	gdal.spec 
Added Files:
	import.log 
Log Message:

 ----------------------------------------------------------------------
 Modified Files:
 	devel/gdal.spec 
 Added Files:
 	devel/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
gdal-1_5_1-13_fc9:HEAD:gdal-1.5.1-13.fc9.src.rpm:1213281502


Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gdal.spec	28 May 2008 14:53:52 -0000	1.45
+++ gdal.spec	12 Jun 2008 14:53:11 -0000	1.46
@@ -11,17 +11,21 @@
 Patch1:    %{name}-perl510.patch
 Patch2:    %{name}-sincos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool swig pkgconfig ruby java-devel ant
+BuildRequires: libtool pkgconfig
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
 BuildRequires: doxygen tetex-latex ghostscript ruby-devel jpackage-utils
 BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
 BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
 BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
-BuildRequires: python-devel >= 2.4 xerces-c-devel
+BuildRequires: python-devel xerces-c-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 
+%if "%{?dist}" != ".el4"
+BuildRequires: ant swig ruby java-devel
+%endif
+
 # enable/disable grass support, for bootstrapping
-%define grass_support 1
+%define grass_support 0
 # enable/disable refman generation
 %define build_refman  1
 
@@ -68,6 +72,7 @@
 %description perl
 The GDAL perl modules provides support to handle multiple GIS file formats.
 
+%if "%{?dist}" != ".el4"
 %package ruby
 Summary: Ruby modules for the GDAL file format library
 Group: Development/Libraries
@@ -85,6 +90,7 @@
 
 %description java
 The GDAL java modules provides support to handle multiple GIS file formats.
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}-fedora
@@ -203,8 +209,10 @@
         --with-curl               \
         --with-python             \
         --with-perl               \
+%if "%{?dist}" != ".el4"
         --with-ruby               \
         --with-java               \
+%endif
         --with-xerces             \
         --with-xerces-lib='-lxerces-c' \
         --with-xerces-inc=%{_includedir} \
@@ -241,6 +249,7 @@
  echo > Makefile.PL;
 popd
 
+%if "%{?dist}" != ".el4"
 # make java modules
 pushd swig/java
 make generate
@@ -248,6 +257,7 @@
 rm -rf org/gdal/gdal/ColorEntry.java
 make build
 popd
+%endif
 
 # remake documentation for multilib issues
 # olso include many pdf documentation
@@ -297,6 +307,7 @@
 mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch}/
 find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \;
 
+%if "%{?dist}" != ".el4"
 # move ruby modules in the right path
 mv %{buildroot}%{ruby_sitearch}/%{name}/*.* %{buildroot}%{ruby_sitearch}/
 rm -rf %{buildroot}%{ruby_sitearch}/%{name}
@@ -306,6 +317,7 @@
 mkdir -p %{buildroot}%{_javadir}
 cp -p swig/java/gdal.jar  \
       %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%endif
 
 # fix some exec bits
 find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
@@ -325,7 +337,10 @@
 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/
 install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
+%if "%{?dist}" != ".el4"
+# broken on el4
 install -p -m 644 frmts/gxf/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
+%endif
 install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
 install -p -m 644 frmts/iso8211/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/iso8211/
 mkdir -p doc/docs-perl/docs-%{cpuarch}/pdf
@@ -490,6 +505,7 @@
 %doc swig/perl/README
 %{perl_vendorarch}/*
 
+%if "%{?dist}" != ".el4"
 %files ruby
 %defattr(-,root,root,-)
 %{ruby_sitearch}/gdal.so
@@ -501,6 +517,7 @@
 %defattr(-,root,root,-)
 %doc swig/java/apps
 %{_javadir}/%{name}-%{version}.jar
+%endif
 
 %changelog
 * Wed May 27 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.1-13