Author: qboosh Date: Tue Feb 20 17:39:46 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.1.6 - updated pic patch, removed obsolete driversdir patch
---- Files affected: SPECS: ogdi.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/ogdi.spec diff -u SPECS/ogdi.spec:1.19 SPECS/ogdi.spec:1.20 --- SPECS/ogdi.spec:1.19 Tue Feb 13 08:16:50 2007 +++ SPECS/ogdi.spec Tue Feb 20 18:39:41 2007 @@ -8,16 +8,15 @@ Summary: Open Geographic Datastore Interface Summary(pl.UTF-8): OGDI - otwarty interfejs do danych geograficznych Name: ogdi -Version: 3.1.5 -Release: 2 +Version: 3.1.6 +Release: 1 License: BSD-like Group: Applications Source0: http://dl.sourceforge.net/ogdi/%{name}-%{version}.tar.gz -# Source0-md5: 9ccf8202b63875a68ded23588bd49544 +# Source0-md5: 212ad71896aa70528ed139c95bed6511 Source1: http://ogdi.sourceforge.net/ogdi.pdf # Source1-md5: 029a8cdcd36bee73df92196ee769040e -Patch0: %{name}-driversdir.patch -Patch1: %{name}-pic.patch +Patch0: %{name}-pic.patch URL: http://ogdi.sourceforge.net/ BuildRequires: autoconf BuildRequires: expat-devel @@ -86,7 +85,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 cp -f %{SOURCE1} . @@ -98,7 +96,10 @@ --with-proj \ --with-zlib +# bash because of pushd/popd used in makefiles %{__make} \ + SHELL=/bin/bash \ + INST_LIB=%{_libdir} \ OPTIMIZATION="%{rpmcflags}" %if %{with tcl} @@ -110,7 +111,7 @@ OPTIMIZATION="%{rpmcflags}" %if %{with odbc} %{__make} -C ogdi/attr_driver/odbc \ - OPTIMIZATION="%{rpmcflags}" \ + OPTIMIZATION="%{rpmcflags} -DDONT_TD_VOID" \ ODBC_LINKLIB="-lodbc" %endif @@ -120,8 +121,9 @@ TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET %{__make} install \ + SHELL=/bin/bash \ INST_INCLUDE=$RPM_BUILD_ROOT%{_includedir} \ - INST_LIB=$RPM_BUILD_ROOT%{_libdir}/ogdi \ + INST_LIB=$RPM_BUILD_ROOT%{_libdir} \ INST_BIN=$RPM_BUILD_ROOT%{_bindir} %if %{with tcl} @@ -129,15 +131,12 @@ INST_LIB=$RPM_BUILD_ROOT%{_libdir} %endif %{__make} install -C contrib/gdal \ - INST_LIB=$RPM_BUILD_ROOT%{_libdir}/ogdi + INST_LIB=$RPM_BUILD_ROOT%{_libdir} %if %{with odbc} %{__make} install -C ogdi/attr_driver/odbc \ - INST_LIB=$RPM_BUILD_ROOT%{_libdir}/ogdi + INST_LIB=$RPM_BUILD_ROOT%{_libdir} %endif -# only libogdi* is common library, the rest are dlopened drivers -mv -f $RPM_BUILD_ROOT%{_libdir}/ogdi/libogdi*.so $RPM_BUILD_ROOT%{_libdir} - %clean rm -rf $RPM_BUILD_ROOT @@ -149,13 +148,14 @@ %doc LICENSE NEWS %attr(755,root,root) %{_bindir}/gltpd %attr(755,root,root) %{_bindir}/ogdi_* -%attr(755,root,root) %{_libdir}/libogdi*.so +%attr(755,root,root) %{_libdir}/libogdi.so.*.* %dir %{_libdir}/ogdi %attr(755,root,root) %{_libdir}/ogdi/lib[!l]*.so %files devel %defattr(644,root,root,755) %doc ogdi.pdf +%attr(755,root,root) %{_libdir}/libogdi.so %{_includedir}/*.h %if %{with odbc} @@ -167,7 +167,7 @@ %if %{with tcl} %files -n tcl-ogdi %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libecs_tcl.so +%attr(755,root,root) %{_libdir}/ogdi/libecs_tcl.so %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -176,6 +176,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20 2007/02/20 17:39:41 qboosh +- updated to 3.1.6 +- updated pic patch, removed obsolete driversdir patch + Revision 1.19 2007/02/13 07:16:50 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ogdi.spec?r1=1.19&r2=1.20&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
