rpms/ogdi/F-8 .cvsignore, 1.2, 1.3 ogdi.spec, 1.5, 1.6 sources, 1.2, 1.3 ogdi-3.2.0.beta1-optflags.patch, 1.1, NONE ogdi-fix-matrix.patch, 1.1, NONE ogdi-mfix.patch, 1.1, NONE

[Balint Cristian (rezso)]

Author: rezso

Update of /cvs/pkgs/rpms/ogdi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20841/F-8

Modified Files:
	.cvsignore ogdi.spec sources 
Removed Files:
	ogdi-3.2.0.beta1-optflags.patch ogdi-fix-matrix.patch 
	ogdi-mfix.patch 
Log Message:
- new bugfix upstream
- drop all patches, upstream now
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/.cvsignore F-8/ogdi.spec F-8/sources 
 Removed Files:
 	F-8/ogdi-3.2.0.beta1-optflags.patch F-8/ogdi-fix-matrix.patch 
 	F-8/ogdi-mfix.patch 
 ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2007 11:41:10 -0000	1.2
+++ .cvsignore	28 May 2008 13:15:12 -0000	1.3
@@ -1,2 +1,2 @@
-ogdi-3.2.0.beta1.tar.gz
 ogdi.pdf
+ogdi-3.2.0.beta2.tar.gz


Index: ogdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/F-8/ogdi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ogdi.spec	26 May 2008 15:39:06 -0000	1.5
+++ ogdi.spec	28 May 2008 13:15:12 -0000	1.6
@@ -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 @@
 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 @@
 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 <<EOF
+#!/bin/bash
+
+ARCH=$(uname -m)
+case $ARCH in
+x86_64 | ppc64 | ia64 | s390x | sparc64 | alpha | alphaev6 )
+gdal-config-64 ${*}
+;;
+*)
+gdal-config-32 ${*}
+;;
+esac
+EOF
+touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config
 
 %clean
 rm -rf %{buildroot}
@@ -151,6 +159,7 @@
 %doc ogdi.pdf
 %doc ogdi/examples/example1/example1.c
 %doc ogdi/examples/example2/example2.c
+%{_bindir}/%{name}-config
 %{_bindir}/%{name}-config-%{cpuarch}
 %{_libdir}/pkgconfig/%{name}.pc
 %dir %{_includedir}/%{name}
@@ -166,6 +175,10 @@
 %{_libdir}/%{name}/libecs_tcl.so
 
 %changelog
+* Wed May  28 2008 Balint Cristian <rezso at rdsor.ro> - 3.2.0-0.10.beta2
+- new bugfix upstream
+- drop all patches, upstream now
+
 * Mon May  26 2008 Balint Cristian <rezso at rdsor.ro> - 3.2.0-0.9.beta1
 - fix debuginfo bz#329921
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2007 11:41:10 -0000	1.2
+++ sources	28 May 2008 13:15:12 -0000	1.3
@@ -1,2 +1,2 @@
-193da3f154985d37bb5aaa886e78f650  ogdi-3.2.0.beta1.tar.gz
 029a8cdcd36bee73df92196ee769040e  ogdi.pdf
+8efc8f1e1dc77bfeda431d9b8e08d871  ogdi-3.2.0.beta2.tar.gz


--- ogdi-3.2.0.beta1-optflags.patch DELETED ---


--- ogdi-fix-matrix.patch DELETED ---


--- ogdi-mfix.patch DELETED ---