rpms/ogdi/F-7 ogdi-3.2.0.beta1-optflags.patch, NONE, 1.1 ogdi.spec, 1.4, 1.5
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Mon May 26 15:42:18 UTC 2008
Author: rezso
Update of /cvs/pkgs/rpms/ogdi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649/F-7
Modified Files:
ogdi.spec
Added Files:
ogdi-3.2.0.beta1-optflags.patch
Log Message:
fix debuginfo bz#329921
----------------------------------------------------------------------
Modified Files:
F-7/ogdi.spec
Added Files:
F-7/ogdi-3.2.0.beta1-optflags.patch
----------------------------------------------------------------------
ogdi-3.2.0.beta1-optflags.patch:
--- NEW FILE ogdi-3.2.0.beta1-optflags.patch ---
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'
Index: ogdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogdi/F-7/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 26 May 2008 15:41:25 -0000 1.5
@@ -1,14 +1,15 @@
Name: ogdi
Version: 3.2.0
-Release: 0.5.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 @@
%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 @@
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 +93,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 +151,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 +166,18 @@
%{_libdir}/%{name}/libecs_tcl.so
%changelog
+* 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
More information about the fedora-extras-commits
mailing list