From 04b77c9e7a9f89ea896a03a7342892ec3662fb6e Mon Sep 17 00:00:00 2001
From: Balint Cristian <rezso@fedoraproject.org>
Date: Mon, 26 May 2008 15:24:14 +0000
Subject: [PATCH] fix debuginfo bz#329921
 ----------------------------------------------------------------------    
 Modified Files: devel/ogdi.spec Added Files:    
 devel/ogdi-3.2.0.beta1-optflags.patch
 ----------------------------------------------------------------------

---
 ogdi-3.2.0.beta1-optflags.patch | 25 +++++++++++++++++++++++++
 ogdi.spec                       | 12 ++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 ogdi-3.2.0.beta1-optflags.patch

diff --git a/ogdi-3.2.0.beta1-optflags.patch b/ogdi-3.2.0.beta1-optflags.patch
new file mode 100644
index 0000000..449373c
--- /dev/null
+++ b/ogdi-3.2.0.beta1-optflags.patch
@@ -0,0 +1,25 @@
+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.spec b/ogdi.spec
index 4b47a13..2c01911 100644
--- a/ogdi.spec
+++ b/ogdi.spec
@@ -1,14 +1,15 @@
 Name:           ogdi
 Version:        3.2.0
-Release:        0.8.beta1%{?dist}
+Release:        0.9.beta1%{?dist}
 Summary:        Open Geographic Datastore Interface
 Group:          Applications/Engineering
-License:        BSD-like
+License:        BSD
 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
+Patch2:         ogdi-3.2.0.beta1-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires:  unixODBC-devel zlib-devel 
@@ -54,6 +55,9 @@ TCL wrapper for OGDI.
 %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
 # include documentation
 cp -p %{SOURCE1} .
 
@@ -61,6 +65,7 @@ cp -p %{SOURCE1} .
 
 TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
 INST_LIB=%{_libdir}/;export INST_LIB
+export CFG=debug # for -g
 
 # do not compile with ssp. it will trigger internal bugs (to_fix_upstream)
 OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
@@ -161,6 +166,9 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/libecs_tcl.so
 
 %changelog
+* Mon May  26 2008 Balint Cristian <rezso@rdsor.ro> - 3.2.0-0.9.beta1
+- fix debuginfo bz#329921
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.2.0-0.8.beta1
 - Autorebuild for GCC 4.3