From 6b59fa88c58c88db2786ae975d52a0d84608a41a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 26 Jan 2003 14:31:00 +0000 Subject: [PATCH] - 1.1.8, updated DESTDIR patch, removed obsolete jpeg patch - new patches: soname (add missing soname to libgdal), xerces (workaround) - splitted into subpackages, updated BRs Changed files: gdal-DESTDIR.patch -> 1.2 gdal-jpeg.patch -> 1.2 gdal-soname.patch -> 1.1 gdal-xerces.patch -> 1.1 gdal.spec -> 1.2 --- gdal-DESTDIR.patch | 11 +++--- gdal-jpeg.patch | 14 ------- gdal-soname.patch | 28 +++++++++++++ gdal-xerces.patch | 10 +++++ gdal.spec | 97 +++++++++++++++++++++++++++++++++++++--------- 5 files changed, 122 insertions(+), 38 deletions(-) delete mode 100644 gdal-jpeg.patch create mode 100644 gdal-soname.patch create mode 100644 gdal-xerces.patch diff --git a/gdal-DESTDIR.patch b/gdal-DESTDIR.patch index 1854c64..37c1cfe 100644 --- a/gdal-DESTDIR.patch +++ b/gdal-DESTDIR.patch @@ -1,5 +1,5 @@ ---- gdal-1.1.7/GNUmakefile.orig Wed Mar 27 22:41:45 2002 -+++ gdal-1.1.7/GNUmakefile Mon Jun 17 22:45:44 2002 +--- gdal-1.1.8/GNUmakefile.orig Wed Mar 27 22:41:45 2002 ++++ gdal-1.1.8/GNUmakefile Mon Jun 17 22:45:44 2002 @@ -114,10 +114,10 @@ install: lib install-actions @@ -15,7 +15,7 @@ (cd port; $(MAKE) install) (cd core; $(MAKE) install) (cd frmts; $(MAKE) install) -@@ -126,8 +126,8 @@ +@@ -126,9 +126,9 @@ ifneq ($(PYTHON),no) (cd pymod; $(MAKE) install) endif @@ -25,8 +25,9 @@ - $(INSTALL) $(GDAL_SLIB) $(INST_LIB) + $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB) endif -- for f in data/*.csv data/stateplane.txt ; do $(INSTALL) $$f $(INST_DATA) ; done -+ for f in data/*.csv data/stateplane.txt ; do $(INSTALL) $$f $(DESTDIR)$(INST_DATA) ; done +- for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(INST_DATA) ; done ++ for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(INST_DATA) ; done + --- gdal-1.1.7/ogr/GNUmakefile.orig Fri Mar 29 00:54:26 2002 +++ gdal-1.1.7/ogr/GNUmakefile Mon Jun 17 22:46:38 2002 @@ -123,16 +123,16 @@ diff --git a/gdal-jpeg.patch b/gdal-jpeg.patch deleted file mode 100644 index 53c91b1..0000000 --- a/gdal-jpeg.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gdal-1.1.7/configure.in.orig Fri Apr 12 22:19:12 2002 -+++ gdal-1.1.7/configure.in Mon Jun 17 22:30:23 2002 -@@ -309,8 +309,10 @@ - AC_MSG_CHECKING([for width_in_blocks in jpeglib.h]) - - rm -f conftest.c -+ echo '#include ' >> conftest.c -+ echo '#include ' >> conftest.c - echo '#include "jpeglib.h"' >> conftest.c -- echo 'int main() { jpeg_component_info *compptr=0; int i; i = comptr->width_in_blocks; }' >> conftest.c -+ echo 'int main() { jpeg_component_info *compptr=0; int i; i = compptr->width_in_blocks; }' >> conftest.c - if test -z "`${CC} -o conftest conftest.c 2>&1`" ; then - AC_MSG_RESULT([yes]) - else diff --git a/gdal-soname.patch b/gdal-soname.patch new file mode 100644 index 0000000..59a7876 --- /dev/null +++ b/gdal-soname.patch @@ -0,0 +1,28 @@ +--- gdal-1.1.8/GNUmakefile.orig Sun Jan 26 12:36:20 2003 ++++ gdal-1.1.8/GNUmakefile Sun Jan 26 13:39:08 2003 +@@ -10,7 +10,7 @@ + force-lib: + $(AR) r $(GDAL_LIB) $(GDAL_OBJ) + $(RANLIB) $(GDAL_LIB) +- $(LD_SHARED) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB) ++ $(LD_SHARED) -Wl,-soname=libgdal.$(GDAL_VER).$(SO_EXT) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB) + + # If you really want proper SO files that will work in /usr/lib + # Try replacing the above command with something like this: +@@ -23,7 +23,7 @@ + $(RANLIB) $(GDAL_LIB) + + $(GDAL_SLIB): $(GDAL_LIB) $(GDALA_DEP) +- $(LD_SHARED) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB) ++ $(LD_SHARED) -Wl,-soname=libgdal.$(GDAL_VER).$(SO_EXT) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB) + + check-lib: + $(MAKE) $(GDAL_LIB) +@@ -143,6 +143,7 @@ + $(INSTALL) $(GDAL_LIB) $(DESTDIR)$(INST_LIB) + ifeq ($(HAVE_LD_SHARED),yes) + $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB) ++ ln -sf $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/libgdal.so + endif + for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(INST_DATA) ; done + diff --git a/gdal-xerces.patch b/gdal-xerces.patch new file mode 100644 index 0000000..3641632 --- /dev/null +++ b/gdal-xerces.patch @@ -0,0 +1,10 @@ +--- gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h.orig Wed Mar 6 21:08:02 2002 ++++ gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h Sun Jan 26 14:37:19 2003 +@@ -46,6 +46,7 @@ + + #include "gmlreader.h" + ++#undef INFINITY + #include + #include + #include diff --git a/gdal.spec b/gdal.spec index 8df7f55..84a8b79 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,31 +1,37 @@ # # TODO: -# separate -devel, python- etc. -# more formats (CFITSIO, OGDI, GRASS) -# link dynamically where possible +# - consider using GRASS (or GDAL in GRASS? build trap possible) +# %include /usr/lib/rpm/macros.python Summary: Geospatial Data Abstraction Library Summary(pl): Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi Name: gdal -Version: 1.1.7 -Release: 0.1 +Version: 1.1.8 +Release: 1 License: BSD-like Group: Libraries Source0: ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz -Patch0: %{name}-jpeg.patch -Patch1: %{name}-acfix.patch -Patch2: %{name}-pgsql.patch -Patch3: %{name}-DESTDIR.patch +Patch0: %{name}-acfix.patch +Patch1: %{name}-pgsql.patch +Patch2: %{name}-DESTDIR.patch +Patch3: %{name}-soname.patch +Patch4: %{name}-xerces.patch URL: http://www.remotesensing.org/gdal/ BuildRequires: autoconf -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -#BuildRequires: libtiff-devel >= 3.6.0 -BuildRequires: libungif-devel +BuildRequires: cfitsio-devel +BuildRequires: hdf-devel >= 4.0 +BuildRequires: jasper-devel +BuildRequires: libgeotiff-devel +BuildRequires: libjpeg-devel >= 6b +BuildRequires: libpng-devel >= 1.0.6 +BuildRequires: libtiff-devel >= 3.6.0 +BuildRequires: libungif-devel >= 4.0 +BuildRequires: ogdi-devel >= 3.1 BuildRequires: postgresql-devel BuildRequires: postgresql-backend-devel BuildRequires: python-devel BuildRequires: rpm-pythonprov +BuildRequires: xerces-c-devel = 1.7.0 BuildRequires: zlib-devel >= 1.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -45,35 +51,88 @@ do wszystkich obs (której ¼ród³a s± do³±czone do drzewa ¼róde³ GDAL) daje podobne mo¿liwo¶ci dla danych wektorowych. +%package devel +Summary: GDAL library header files +Summary(pl): Pliki nag³ówkowe biblioteki GDAL +Group: Development/Libraries +Requires: %{name} = %{version} + +%description devel +GDAL library header files. + +%description devel -l pl +Pliki nag³ówkowe biblioteki GDAL. + +%package static +Summary: GDAL static libraries +Summary(pl): Statyczne biblioteki GDAL +Group: Development/Libraries +Requires: %{name}-devel = %{version} + +%description static +GDAL static libraries. + +%description static -l pl +Statyczne biblioteki GDAL. + +%package -n python-gdal +Summary: GDAL Python module +Summary(pl): Modu³ Pythona GDAL +Group: Libraries/Python +Requires: %{name} = %{version} + +%description -n python-gdal +GDAL Python module. + +%description -n python-gdal -l pl +Modu³ Pythona GDAL. + %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %{__autoconf} -%configure +%configure \ + --with-xerces \ + --with-xerces-inc=/usr/include/xercesc \ + --with-xerces-lib="-lxerces-c1_7_0" \ + --without-grass %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(644,root,root,755) -%doc NEWS html/*.{html,gif,css} +%doc ChangeLog NEWS html/*.{html,gif,png,css} %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/*.a +%attr(755,root,root) %{_libdir}/libgdal.*.so +%{_datadir}/gdal + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgdal.so %{_includedir}/*.h + +%files static +%defattr(644,root,root,755) +%{_libdir}/*.a + +%files -n python-gdal +%defattr(644,root,root,755) %attr(755,root,root) %{py_sitedir}/_gdalmodule.so %{py_sitedir}/*.py -%{_datadir}/gdal -- 2.43.0