rpms/ogdi/devel ogdi.spec,1.5,1.6

[Balint Cristian (rezso)]

Author: rezso

Update of /cvs/pkgs/rpms/ogdi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30063/devel

Modified Files:
	ogdi.spec 
Log Message:
 fix multilib issue for ogdi-config
 Modified Files:
 	devel/ogdi.spec 



Index: ogdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/devel/ogdi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ogdi.spec	4 Jan 2008 05:05:00 -0000	1.5
+++ ogdi.spec	9 Jan 2008 03:01:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ogdi
 Version:        3.2.0
-Release:        0.6.beta1%{?dist}
+Release:        0.7.beta1%{?dist}
 Summary:        Open Geographic Datastore Interface
 Group:          Applications/Engineering
 License:        BSD-like
@@ -88,34 +88,44 @@
           ODBC_LINKLIB="-lodbc"
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # 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}
+        INST_INCLUDE=%{buildroot}%{_includedir}/%{name} \
+        INST_LIB=%{buildroot}%{_libdir} \
+        INST_BIN=%{buildroot}%{_bindir}
 
 # install plugins olso
 make install -C ogdi/tcl_interface \
-        INST_LIB=$RPM_BUILD_ROOT%{_libdir}
+        INST_LIB=%{buildroot}%{_libdir}
 make install -C contrib/gdal \
-        INST_LIB=$RPM_BUILD_ROOT%{_libdir}
+        INST_LIB=%{buildroot}%{_libdir}
 make install -C ogdi/attr_driver/odbc \
-        INST_LIB=$RPM_BUILD_ROOT%{_libdir}
+        INST_LIB=%{buildroot}%{_libdir}
 
 # remove example binary
-rm $RPM_BUILD_ROOT%{_bindir}/example?
+rm %{buildroot}%{_bindir}/example?
+
+# we have multilib ogdi-config
+%if "%{_lib}" == "lib"
+%define cpuarch 32
+%else
+%define cpuarch 64
+%endif
+
+# fix file(s) for multilib issue
+touch -r ogdi-config.in ogdi-config
 
 # 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}
+install -p -m 755 ogdi-config %{buildroot}%{_bindir}/ogdi-config-%{cpuarch}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -136,7 +146,7 @@
 %doc ogdi.pdf
 %doc ogdi/examples/example1/example1.c
 %doc ogdi/examples/example2/example2.c
-%{_bindir}/ogdi-config
+%{_bindir}/%{name}-config-%{cpuarch}
 %{_libdir}/pkgconfig/%{name}.pc
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
@@ -151,6 +161,9 @@
 %{_libdir}/%{name}/libecs_tcl.so
 
 %changelog
+* Wed Jan  9 2008 Balint Cristian <rezso at rdsor.ro> - 3.2.0-0.7.beta1
+- fix multilib issue for ogdi-config
+
 * Thu Jan  3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.2.0-0.6.beta1
 - Rebuild for new Tcl 8.5