- new

- driversdir patch to allow installing drivers outside /usr/lib

Changed files:
    ogdi-driversdir.patch -> 1.1
    ogdi.spec -> 1.1

diff --git a/ogdi-driversdir.patch b/ogdi-driversdir.patch
new file mode 100644 (file)
index 0000000..85de53d
--- /dev/null
+++ b/ogdi-driversdir.patch
@@ -0,0 +1,30 @@
+--- ogdi-3.1.1/ogdi/c-api/ecs_dyna.c.orig      Mon Apr  9 17:04:34 2001
++++ ogdi-3.1.1/ogdi/c-api/ecs_dyna.c   Tue Jun 18 21:37:08 2002
+@@ -73,9 +73,27 @@
+     return (void *) handle;
+   }
+ #else
++#define MODULES_PATH "/usr/lib/ogdi/"
+   void *handle;
+ 
+   handle = dlopen(libname,RTLD_LAZY);
++  if (handle != NULL)
++    return handle;
++
++  if ((temp = (char *) malloc(strlen(MODULES_PATH)+strlen(libname)+1)) == NULL)
++    return NULL;
++  sprintf(temp,MODULES_PATH "%s",libname);
++  handle = dlopen(temp,RTLD_LAZY);
++  free(temp);
++  if (handle != NULL)
++    return handle;
++
++  if ((temp = (char *) malloc(strlen(MODULES_PATH)+strlen(libname)+7)) == NULL)
++    return NULL;
++  sprintf(temp,MODULES_PATH "lib%s.so",libname);
++  handle = dlopen(temp,RTLD_LAZY);
++  free(temp);
++
+   if (handle == NULL) {
+     /* Try with the .so extension */
+ 

diff --git a/ogdi.spec b/ogdi.spec
new file mode 100644 (file)
index 0000000..6dff8b1
--- /dev/null
+++ b/ogdi.spec
@@ -0,0 +1,148 @@
+# TODO: separate gltpd to -server package, add init script (requires portmap)
+Summary:       Open Geographic Datastore Interface
+Summary(pl):   OGDI - otwarty interfejs do danych geograficznych
+Name:          ogdi
+Version:       3.1.1
+Release:       1
+License:       BSD-like
+Group:         Applications
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/ogdi/%{name}-%{version}.tar.gz
+Source1:       http://ogdi.sourceforge.net/ogdi.pdf
+Patch0:                %{name}-driversdir.patch
+URL:           http://ogdi.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: expat-devel
+BuildRequires: proj-devel
+BuildRequires: tcl-devel
+BuildRequires: unixODBC-devel
+BuildRequires: zlib-devel
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+OGDI is the Open Geographic Datastore Interface. OGDI is an
+application programming interface (API) that uses a standardized
+access methods to work in conjunction with GIS software packages (the
+application) and various geospatial data products. OGDI uses a
+client/server architecture to facilitate the dissemination of
+geospatial data products over any TCP/IP network, and a
+driver-oriented approach to facilitate access to several geospatial
+data products/formats.
+                 
+%description -l pl
+OGDI (Open Geographic Datastore Interface) oznacza otwarty interfejs
+do danych geograficznych. OGDI to API u¿ywaj±ce ustandaryzowanych
+metod dostêpu do pracy z pakietami oprogramowania GIS i ró¿nymi danymi
+geograficznymi. OGDI u¿ywa architektury klient-serwer aby udostêpniaæ
+dane po dowolnej sieci TCP/IP oraz podej¶cia bazuj±cego na
+sterownikach aby zapewniæ dostêp do ró¿nych produktów/formatów danych
+geograficznych.
+
+%package devel
+Summary:       OGDI header files and documentation
+Summary(pl):   Pliki nag³ówkowe i dokumentacja OGDI
+Group:         Development/Libraries
+Requires:      %{name} = %{version}
+
+%description devel
+OGDI header files and developer's documentation.
+
+%description devel -l pl
+Pliki nag³ówkowe i dokumentacja programisty do OGDI.
+
+%package odbc
+Summary:       ODBC driver for OGDI
+Summary(pl):   Sterownik ODBC do OGDI
+Group:         Libraries
+Requires:      %{name} = %{version}
+
+%description odbc
+ODBC driver for OGDI.
+
+%description odbc -l pl
+Sterownik ODBC do OGDI.
+
+%package -n tcl-ogdi
+Summary:       TCL wrapper for OGDI
+Summary(pl):   Interfejs TCL do OGDI
+Group:         Libraries
+Requires:      %{name} = %{version}
+
+%description -n tcl-ogdi
+TCL wrapper for OGDI.
+
+%description -n tcl-ogdi -l pl
+Interfejs TCL do OGDI.
+
+%prep
+%setup -q
+%patch -p1
+
+cp -f %{SOURCE1} .
+
+%build
+%{__autoconf}
+TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
+%configure \
+       --with-expat \
+       --with-proj \
+       --with-zlib
+
+%{__make} \
+       OPTIMIZATION="%{rpmcflags}"
+
+%{__make} -C ogdi/tcl_interface \
+       OPTIMIZATION="%{rpmcflags}" \
+       TCL_LINKLIB="-ltcl"
+%{__make} -C contrib/gdal \
+       OPTIMIZATION="%{rpmcflags}"
+%{__make} -C ogdi/attr_driver/odbc \
+       OPTIMIZATION="%{rpmcflags}" \
+       ODBC_LINKLIB="-lodbc"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
+
+%{__make} install \
+       INST_INCLUDE=$RPM_BUILD_ROOT%{_includedir} \
+       INST_LIB=$RPM_BUILD_ROOT%{_libdir}/ogdi \
+       INST_BIN=$RPM_BUILD_ROOT%{_bindir}
+
+%{__make} install -C ogdi/tcl_interface \
+       INST_LIB=$RPM_BUILD_ROOT%{_libdir}
+%{__make} install -C contrib/gdal \
+       INST_LIB=$RPM_BUILD_ROOT%{_libdir}/ogdi
+%{__make} install -C ogdi/attr_driver/odbc \
+       INST_LIB=$RPM_BUILD_ROOT%{_libdir}/ogdi
+
+# only libogdi* is common library, the rest are dlopened drivers
+mv -f $RPM_BUILD_ROOT%{_libdir}/ogdi/libogdi*.so $RPM_BUILD_ROOT%{_libdir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc LICENSE NEWS
+%attr(755,root,root) %{_bindir}/gltpd
+%attr(755,root,root) %{_bindir}/ogdi_*
+%attr(755,root,root) %{_libdir}/libogdi*.so
+%dir %{_libdir}/ogdi
+%attr(755,root,root) %{_libdir}/ogdi/lib[^l]*.so
+
+%files devel
+%defattr(644,root,root,755)
+%doc ogdi.pdf
+%{_includedir}/*.h
+
+%files odbc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ogdi/liblodbc.so
+
+%files -n tcl-ogdi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libecs_tcl.so