From c0b5d51fe7d6b670c0a80698d62a80c7c1cd4815 Mon Sep 17 00:00:00 2001 From: Balint Cristian Date: Wed, 28 May 2008 13:06:21 +0000 Subject: [PATCH] - new bugfix upstream - drop all patches, upstream now ---------------------------------------------------------------------- Modified Files: devel/.cvsignore devel/ogdi.spec devel/sources Removed Files: devel/ogdi-3.2.0.beta1-optflags.patch devel/ogdi-fix-matrix.patch devel/ogdi-mfix.patch ---------------------------------------------------------------------- --- .cvsignore | 2 +- ogdi-3.2.0.beta1-optflags.patch | 25 -------------- ogdi-fix-matrix.patch | 58 --------------------------------- ogdi-mfix.patch | 11 ------- ogdi.spec | 35 +++++++++++++------- sources | 2 +- 6 files changed, 26 insertions(+), 107 deletions(-) delete mode 100644 ogdi-3.2.0.beta1-optflags.patch delete mode 100644 ogdi-fix-matrix.patch delete mode 100644 ogdi-mfix.patch diff --git a/.cvsignore b/.cvsignore index 769e7d5..5dc32d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -ogdi-3.2.0.beta1.tar.gz ogdi.pdf +ogdi-3.2.0.beta2.tar.gz diff --git a/ogdi-3.2.0.beta1-optflags.patch b/ogdi-3.2.0.beta1-optflags.patch deleted file mode 100644 index 449373c..0000000 --- a/ogdi-3.2.0.beta1-optflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up ogdi-3.2.0.beta1/configure.in~ ogdi-3.2.0.beta1/configure.in ---- ogdi-3.2.0.beta1/configure.in~ 2007-02-24 19:37:33.000000000 +0200 -+++ ogdi-3.2.0.beta1/configure.in 2007-10-12 22:13:58.000000000 +0300 -@@ -36,9 +36,6 @@ AC_COMPILER_WFLAGS - AC_COMPILER_PIC - AC_LD_SHARED - --dnl Strip out optimization if already added --CFLAGS=`echo "$CFLAGS " | sed "s/-O2 //"` -- - dnl --------------------------------------------------------------------------- - dnl Do we have rpc/pmap_clnt.h, float.h, dlfcn.h? - dnl --------------------------------------------------------------------------- -diff -up ogdi-3.2.0.beta1/configure~ ogdi-3.2.0.beta1/configure ---- ogdi-3.2.0.beta1/configure~ 2007-02-24 19:37:33.000000000 +0200 -+++ ogdi-3.2.0.beta1/configure 2007-10-12 22:14:14.000000000 +0300 -@@ -2425,8 +2425,6 @@ _ACEOF - - - --CFLAGS=`echo "$CFLAGS " | sed "s/-O2 //"` -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/ogdi-fix-matrix.patch b/ogdi-fix-matrix.patch deleted file mode 100644 index 7055f1e..0000000 --- a/ogdi-fix-matrix.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- 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 index 2c01911..8a9b5c3 100644 --- a/ogdi.spec +++ b/ogdi.spec @@ -1,15 +1,12 @@ Name: ogdi Version: 3.2.0 -Release: 0.9.beta1%{?dist} +Release: 0.10.beta2%{?dist} Summary: Open Geographic Datastore Interface Group: Applications/Engineering License: BSD URL: http://ogdi.sourceforge.net/ -Source0: http://dl.sourceforge.net/ogdi/%{name}-%{version}.beta1.tar.gz +Source0: http://dl.sourceforge.net/ogdi/%{name}-%{version}.beta2.tar.gz Source1: http://ogdi.sourceforge.net/ogdi.pdf -Patch0: ogdi-fix-matrix.patch -Patch1: ogdi-mfix.patch -Patch2: ogdi-3.2.0.beta1-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) BuildRequires: unixODBC-devel zlib-devel @@ -52,12 +49,8 @@ Requires: %{name} = %{version}-%{release} TCL wrapper for OGDI. %prep -%setup -q -n %{name}-%{version}.beta1 -%patch0 -p0 -b .matrix -%patch1 -p0 -b .warrn -touch -r configure.in configure.in.stamp -%patch2 -p1 -b .optflags -touch -r configure.in.stamp configure.in +%setup -q -n %{name}-%{version}.beta2 + # include documentation cp -p %{SOURCE1} . @@ -128,6 +121,21 @@ touch -r ogdi-config.in ogdi-config mkdir -p %{buildroot}%{_libdir}/pkgconfig install -p -m 644 ogdi.pc %{buildroot}%{_libdir}/pkgconfig/ install -p -m 755 ogdi-config %{buildroot}%{_bindir}/ogdi-config-%{cpuarch} +# ogdi-config wrapper for multiarch +cat > %{buildroot}%{_bindir}/%{name}-config < - 3.2.0-0.10.beta2 +- new bugfix upstream +- drop all patches, upstream now + * Mon May 26 2008 Balint Cristian - 3.2.0-0.9.beta1 - fix debuginfo bz#329921 diff --git a/sources b/sources index 834d615..5c1d9f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -193da3f154985d37bb5aaa886e78f650 ogdi-3.2.0.beta1.tar.gz 029a8cdcd36bee73df92196ee769040e ogdi.pdf +8efc8f1e1dc77bfeda431d9b8e08d871 ogdi-3.2.0.beta2.tar.gz