- Depend specifically on GCJ for Java (Alex Lancaster)

- Disable grass (Alex Lancaster)
- Create %_bindir before copying files there
This commit is contained in:
Jesse Keating 2009-03-23 16:12:11 +00:00
parent f55f50ac19
commit 9bded8600f
2 changed files with 26 additions and 5 deletions

15
gdal-bindir.patch Normal file
View File

@ -0,0 +1,15 @@
Create /usr/bin before attempting to compy anything there.
Lubomir Rintel <lkundrak@v3.sk>
diff -up gdal-1.6.0-fedora/swig/python/GNUmakefile.bindir gdal-1.6.0-fedora/swig/python/GNUmakefile
--- gdal-1.6.0-fedora/swig/python/GNUmakefile.bindir 2009-03-22 23:25:47.582438890 +0100
+++ gdal-1.6.0-fedora/swig/python/GNUmakefile 2009-03-22 23:26:10.465436318 +0100
@@ -60,6 +60,7 @@ else
$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
endif
+ $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
docs:

View File

@ -1,6 +1,6 @@
Name: gdal
Version: 1.6.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
@ -9,6 +9,7 @@ Source0: %{name}-%{version}-fedora.tar.gz
Source1: http://download.osgeo.org/gdal/gdalautotest-1.6.0.tar.gz
Patch0: %{name}-libdap.patch
Patch1: %{name}-mysql.patch
Patch2: %{name}-bindir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool pkgconfig
BuildRequires: python-devel numpy xerces-c-devel
@ -20,11 +21,11 @@ BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeoti
BuildRequires: perl(ExtUtils::MakeMaker)
%if "%{?dist}" != ".el4"
BuildRequires: ant swig ruby java-devel
BuildRequires: ant swig ruby java-devel-gcj
%endif
# enable/disable grass support, for bootstrapping
%define grass_support 1
%define grass_support 0
# enable/disable refman generation
%define build_refman 1
@ -105,6 +106,7 @@ The GDAL java modules provides support to handle multiple GIS file formats.
%patch0 -p1 -b .libdap~
%endif
%patch1 -p0 -b .mysql~
%patch2 -p1 -b .bindir~
# unpack test cases olso.
tar -xzf %{SOURCE1}
@ -502,8 +504,7 @@ rm -rf $RPM_BUILD_ROOT
%files python
%defattr(-,root,root,-)
%doc swig/python/samples
%exclude %{_bindir}/*.py?
%attr(0755,root,root) %{_bindir}/*.py
%attr(0755,root,root) %{_bindir}/*
%{python_sitearch}/*
%{_mandir}/man1/pct2rgb.1.gz
%{_mandir}/man1/rgb2pct.1.gz
@ -530,6 +531,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Sun Mar 22 2009 Lubomir Rintel <lkundrak@v3.sk> - 1.6.0-6
- Depend specifically on GCJ for Java (Alex Lancaster)
- Disable grass (Alex Lancaster)
- Create %%_bindir before copying files there
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild