rpms/ogdi/EL-4 .cvsignore, 1.2, 1.3 ogdi.spec, 1.4, 1.5 sources, 1.2, 1.3 ogdi-fix-matrix.patch, 1.1, NONE ogdi-mfix.patch, 1.1, NONE
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Wed May 28 14:19:16 UTC 2008
Author: rezso
Update of /cvs/pkgs/rpms/ogdi/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31047/EL-4
Modified Files:
.cvsignore ogdi.spec sources
Removed Files:
ogdi-fix-matrix.patch ogdi-mfix.patch
Log Message:
- new stable for EL-4
----------------------------------------------------------------------
Modified Files:
EL-4/.cvsignore EL-4/ogdi.spec EL-4/sources
Removed Files:
EL-4/ogdi-fix-matrix.patch EL-4/ogdi-mfix.patch
----------------------------------------------------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/EL-4/.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 14:18:26 -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/EL-4/ogdi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ogdi.spec 1 Mar 2007 18:35:01 -0000 1.4
+++ ogdi.spec 28 May 2008 14:18:26 -0000 1.5
@@ -1,14 +1,12 @@
Name: ogdi
Version: 3.2.0
-Release: 0.5.beta1%{?dist}
+Release: 0.11.beta2%{?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
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
BuildRequires: unixODBC-devel zlib-devel
@@ -51,9 +49,8 @@
TCL wrapper for OGDI.
%prep
-%setup -q -n %{name}-%{version}.beta1
-%patch0 -p0 -b .matrix
-%patch1 -p0 -b .warrn
+%setup -q -n %{name}-%{version}.beta2
+
# include documentation
cp -p %{SOURCE1} .
@@ -61,6 +58,7 @@
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'`
@@ -88,34 +86,60 @@
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}
+# 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 )
+ogdi-config-64 \${*}
+;;
+*)
+ogdi-config-32 \${*}
+;;
+esac
+EOF
+chmod 755 %{buildroot}%{_bindir}/%{name}-config
+touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -136,7 +160,8 @@
%doc ogdi.pdf
%doc ogdi/examples/example1/example1.c
%doc ogdi/examples/example2/example2.c
-%{_bindir}/ogdi-config
+%{_bindir}/%{name}-config
+%{_bindir}/%{name}-config-%{cpuarch}
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h
@@ -151,6 +176,25 @@
%{_libdir}/%{name}/libecs_tcl.so
%changelog
+* Wed May 28 2008 Balint Cristian <rezso at rdsor.ro> - 3.2.0-0.11.beta2
+- fix a spourios permission
+
+* 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
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.2.0-0.8.beta1
+- Autorebuild for GCC 4.3
+
+* 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
+
* Thu Mar 01 2007 Balint Cristian <cbalint at redhat.com> 3.2.0-0.5.beta1
- fix fc-6 tag upstream fedora-extras
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/EL-4/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 14:18:26 -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-fix-matrix.patch DELETED ---
--- ogdi-mfix.patch DELETED ---
More information about the fedora-extras-commits
mailing list