From 7a794fd2e0e91b4c4ffd79e83ce55b874bc4c0ee Mon Sep 17 00:00:00 2001 From: Balint Cristian Date: Thu, 1 Mar 2007 11:41:10 +0000 Subject: [PATCH] auto-import ogdi-3.2.0-0.2.beta1 on branch devel from ogdi-3.2.0-0.2.beta1.src.rpm --- .cvsignore | 2 + ogdi-fix-matrix.patch | 58 +++++++++++ ogdi-mfix.patch | 11 +++ ogdi.spec | 219 ++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 5 files changed, 292 insertions(+) create mode 100644 ogdi-fix-matrix.patch create mode 100644 ogdi-mfix.patch create mode 100644 ogdi.spec diff --git a/.cvsignore b/.cvsignore index e69de29..769e7d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +ogdi-3.2.0.beta1.tar.gz +ogdi.pdf diff --git a/ogdi-fix-matrix.patch b/ogdi-fix-matrix.patch new file mode 100644 index 0000000..7055f1e --- /dev/null +++ b/ogdi-fix-matrix.patch @@ -0,0 +1,58 @@ +--- ogdi/c-api/matrix.c 2007-02-19 20:31:33.000000000 +0100 ++++ ogdi/c-api/matrix.c 2007-02-25 12:28:21.000000000 +0100 +@@ -42,6 +42,9 @@ + + /* initialize loop iterators */ + int i=0, j=0, k=0; ++ ++ /* initialise result matrix */ ++ mat_init( matrix_result, width_a, width_b ); + + /* compute multiply of each elements into destination matrix */ + for ( i = 0 ; i< height_a; i++ ) +@@ -65,14 +68,17 @@ + double **matrix_result; + { + /* initialize loop iterators */ +- int i=0, j=0, k=0; ++ int i=0, j=0, k=0; ++ ++ /* initialise result matrix */ ++ mat_init( matrix_result, width_a, width_b ); + + /* compute multiply of each elements into destination matrix */ +- for ( i = 0 ; i< height_a; i++ ) +- for ( j = 0 ; j< width_b; j++ ) +- for ( k = 0 ; k< width_a; k++ ) +- matrix_result[i][j] += matrix_a[i][k]*matrix_b[j][k]; +- return; ++ for( i=0; iresult),buffer)) { + free(fclass); free(coverage); free(expression); return FALSE; + } diff --git a/ogdi.spec b/ogdi.spec new file mode 100644 index 0000000..a12c374 --- /dev/null +++ b/ogdi.spec @@ -0,0 +1,219 @@ +Name: ogdi +Version: 3.2.0 +Release: 0.2.beta1%{?dist} +Summary: Open Geographic Datastore Interface +Group: Applications/Engineering +License: BSD-like +URL: http://ogdi.sourceforge.net/ +Source0: http://dl.sourceforge.net/ogdi/%{name}-%{version}.beta1.tar.gz +Source1: http://ogdi.sourceforge.net/ogdi.pdf +Patch0: ogdi-fix-matrix.patch +Patch1: ogdi-mfix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) + +BuildRequires: unixODBC-devel zlib-devel +BuildRequires: expat-devel proj-devel tcl-devel + +%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. + +%package devel +Summary: OGDI header files and documentation +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: zlib-devel expat-devel proj-devel + +%description devel +OGDI header files and developer's documentation. + +%package odbc +Summary: ODBC driver for OGDI +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description odbc +ODBC driver for OGDI. + +%package tcl +Summary: TCL wrapper for OGDI +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description tcl +TCL wrapper for OGDI. + +%prep +%setup -q -n %{name}-%{version}.beta1 +%patch0 -p0 -b .matrix +%patch1 -p0 -b .warrn +# include documentation +cp -p %{SOURCE1} . + +%build + +TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET +INST_LIB=%{_libdir}/;export INST_LIB + +export CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -DDONT_TD_VOID -DUSE_TERMIO" +%configure \ + --with-binconfigs \ + --with-expat \ + --with-proj \ + --with-zlib + +# WARNING !!! +# using %{?_smp_mflags} may break build +make + +# build tcl interface +make -C ogdi/tcl_interface \ + TCL_LINKLIB="-ltcl" + +# build contributions +make -C contrib/gdal + +# build odbc drivers +ODBC_LINKLIB="-lodbc" +make -C ogdi/attr_driver/odbc \ + ODBC_LINKLIB="-lodbc" + +%install +rm -rf $RPM_BUILD_ROOT + +# export env +TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET + +make install \ + INST_INCLUDE=$RPM_BUILD_ROOT%{_includedir}/%{name} \ + INST_LIB=$RPM_BUILD_ROOT%{_libdir} \ + INST_BIN=$RPM_BUILD_ROOT%{_bindir} + +# install plugins olso +make install -C ogdi/tcl_interface \ + INST_LIB=$RPM_BUILD_ROOT%{_libdir} +make install -C contrib/gdal \ + INST_LIB=$RPM_BUILD_ROOT%{_libdir} +make install -C ogdi/attr_driver/odbc \ + INST_LIB=$RPM_BUILD_ROOT%{_libdir} + +# remove example binary +rm $RPM_BUILD_ROOT%{_bindir}/example? + +# install pkgconfig file and ogdi-config +mkdir -p %{buildroot}%{_libdir}/pkgconfig +install -p -m 644 ogdi.pc %{buildroot}%{_libdir}/pkgconfig/ +install -p -m 755 ogdi-config %{buildroot}%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc LICENSE NEWS ChangeLog README +%{_bindir}/gltpd +%{_bindir}/ogdi_* +%{_libdir}/libogdi.so.* +%dir %{_libdir}/ogdi +%exclude %{_libdir}/%{name}/liblodbc.so +%exclude %{_libdir}/%{name}/libecs_tcl.so +%{_libdir}/%{name}/lib*.so + +%files devel +%defattr(-,root,root,-) +%doc ogdi.pdf +%doc ogdi/examples/example1/example1.c +%doc ogdi/examples/example2/example2.c +%{_bindir}/ogdi-config +%{_libdir}/pkgconfig/%{name}.pc +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_libdir}/libogdi.so + +%files odbc +%defattr(-,root,root,-) +%{_libdir}/%{name}/liblodbc.so + +%files tcl +%defattr(-,root,root,-) +%{_libdir}/%{name}/libecs_tcl.so + +%changelog +* Tue Feb 24 2007 Balint Cristian 3.2.0-0.2.beta1 +- rename the release for correct fedora n-v-r +- fix -devel requires + +* Tue Feb 24 2007 Balint Cristian 3.2.0.beta1-1 +- new upstream release. + +* Tue Feb 13 2007 Balint Cristian 3.1.6-5 +- matrix.c is Public Domain. + +* Tue Feb 13 2007 Balint Cristian 3.1.6-4 +- add diff to latest CVS. +- solve matrix algebra license issue from CVS. + +* Tue Feb 13 2007 Balint Cristian 3.1.6-3 +- _dont_ duplicate any docs, so leave odbc and tcl without. + +* Tue Feb 13 2007 Balint Cristian 3.1.6-2 +- fix timestamps of source file. +- no need to duplicate the documentation +- fix post install script +- fix odbc lib innclusion + +* Mon Feb 12 2007 Balint Cristian 3.1.6-1 +- new upstream version. +- drop all patches, now they are upstream. +- remove useless source code cleanup from spec. +- pkgconfig is now autogenerated. + +* Mon Feb 12 2007 Balint Cristian 3.1.5-8 +- get rid of autoconf, useless. +- fix cp usage in specs. + +* Mon Feb 12 2007 Balint Cristian 3.1.5-7 +- include soname proposal patch +- cleanup more in specs + +* Sun Feb 11 2007 Balint Cristian 3.1.5-6 +- massive cleanup in sources. +- use -DUSE_TERMIO flag for linux. +- fix dlopen path. + +* Sat Feb 10 2007 Balint Cristian 3.1.5-5 +- more minor nits in spec +- pack the examples in devel +- drop tdvoid patch use CFLAGS instead +- patch instead use sed in spec (will try merge mainstream) +- fill requires for pkgconf file + +* Sat Feb 10 2007 Balint Cristian 3.1.5-4 +- preserves for external doc. + +* Fri Feb 09 2007 Balint Cristian 3.1.5-3 +- add dlopen path for lib64 too. +- add more docs +- fix export of CFLAGS +- move include files and add pkgconf module + +* Fri Feb 09 2007 Balint Cristian 3.1.5-2 +- add -soname versioning on shared libs +- remove polish lang from spec +- fix packing of libs +- tcl is plugin dont separate package name + +* Wed Feb 08 2007 Balint Cristian 3.1.5-1 +- first build for fedora extras +- require -fPIC, at least on x86_64 +- odbc compile fix use DONT_TD_VOID diff --git a/sources b/sources index e69de29..834d615 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +193da3f154985d37bb5aaa886e78f650 ogdi-3.2.0.beta1.tar.gz +029a8cdcd36bee73df92196ee769040e ogdi.pdf