rpms/gdal/devel gdal-bindir.patch,NONE,1.1 gdal.spec,1.60,1.61
Jesse Keating
jkeating at fedoraproject.org
Mon Mar 23 16:12:42 UTC 2009
Author: jkeating
Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6374
Modified Files:
gdal.spec
Added Files:
gdal-bindir.patch
Log Message:
* Sun Mar 22 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.0-6
- Depend specifically on GCJ for Java (Alex Lancaster)
- Disable grass (Alex Lancaster)
- Create %_bindir before copying files there
gdal-bindir.patch:
--- NEW FILE gdal-bindir.patch ---
Create /usr/bin before attempting to compy anything there.
Lubomir Rintel <lkundrak at 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:
Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gdal.spec 24 Feb 2009 19:57:52 -0000 1.60
+++ gdal.spec 23 Mar 2009 16:12:11 -0000 1.61
@@ -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 @@
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: 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 @@
%patch0 -p1 -b .libdap~
%endif
%patch1 -p0 -b .mysql~
+%patch2 -p1 -b .bindir~
# unpack test cases olso.
tar -xzf %{SOURCE1}
@@ -502,8 +504,7 @@
%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 @@
%endif
%changelog
+* Sun Mar 22 2009 Lubomir Rintel <lkundrak at 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 at lists.fedoraproject.org> - 1.6.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list