- release 11 (by relup.sh)

[packages/ogdi.git] / ogdi.spec

diff --git a/ogdi.spec b/ogdi.spec
index 40b4e268b6a9e69a06b4f3ad6515d46d0ff5a3f2..6893c52972a74f1310f35ef1634f5c2077e43854 100644 (file)
--- a/ogdi.spec
+++ b/ogdi.spec
@@ -8,18 +8,20 @@ Summary:      Open Geographic Datastore Interface
 Summary(pl.UTF-8):     OGDI - otwarty interfejs do danych geograficznych
 Name:          ogdi
 Version:       3.1.6
-Release:       3
+Release:       11
 License:       BSD-like
-Group:         Applications
-Source0:       http://dl.sourceforge.net/ogdi/%{name}-%{version}.tar.gz
+Group:         Applications/Databases
+Source0:       http://downloads.sourceforge.net/ogdi/%{name}-%{version}.tar.gz
 # Source0-md5: 212ad71896aa70528ed139c95bed6511
 Source1:       http://ogdi.sourceforge.net/ogdi.pdf
 # Source1-md5: 029a8cdcd36bee73df92196ee769040e
 Patch0:                %{name}-pic.patch
+Patch1:                %{name}-proj480.patch
+Patch2:                %{name}-format.patch
 URL:           http://ogdi.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: expat-devel
-BuildRequires: proj-devel
+BuildRequires: proj-devel >= 4.8
 %{?with_tcl:BuildRequires:     tcl-devel}
 %{?with_odbc:BuildRequires:    unixODBC-devel}
 BuildRequires: zlib-devel
@@ -49,7 +51,7 @@ Summary:      OGDI header files and documentation
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja OGDI
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      proj-devel
+Requires:      proj-devel >= 4.8
 
 %description devel
 OGDI header files and developer's documentation.
@@ -84,6 +86,8 @@ Interfejs Tcl do OGDI.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 cp -f %{SOURCE1} .
 
@@ -96,20 +100,20 @@ TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
        --with-zlib
 
 # bash because of pushd/popd used in makefiles
-%{__make} \
+%{__make} -j 1 \
        SHELL=/bin/bash \
        INST_LIB=%{_libdir} \
        OPTIMIZATION="%{rpmcflags}"
 
 %if %{with tcl}
-%{__make} -C ogdi/tcl_interface \
+%{__make} -j 1 -C ogdi/tcl_interface \
        OPTIMIZATION="%{rpmcflags}" \
        TCL_LINKLIB="-ltcl"
 %endif
-%{__make} -C contrib/gdal \
+%{__make} -j 1 -C contrib/gdal \
        OPTIMIZATION="%{rpmcflags}"
 %if %{with odbc}
-%{__make} -C ogdi/attr_driver/odbc \
+%{__make} -j 1 -C ogdi/attr_driver/odbc \
        OPTIMIZATION="%{rpmcflags} -DDONT_TD_VOID" \
        ODBC_LINKLIB="-lodbc"
 %endif
@@ -119,20 +123,20 @@ rm -rf $RPM_BUILD_ROOT
 
 TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
 
-%{__make} install \
+%{__make} -j 1 install \
        SHELL=/bin/bash \
        INST_INCLUDE=$RPM_BUILD_ROOT%{_includedir} \
        INST_LIB=$RPM_BUILD_ROOT%{_libdir} \
        INST_BIN=$RPM_BUILD_ROOT%{_bindir}
 
 %if %{with tcl}
-%{__make} install -C ogdi/tcl_interface \
+%{__make} -j 1 install -C ogdi/tcl_interface \
        INST_LIB=$RPM_BUILD_ROOT%{_libdir}
 %endif
-%{__make} install -C contrib/gdal \
+%{__make} -j 1 install -C contrib/gdal \
        INST_LIB=$RPM_BUILD_ROOT%{_libdir}
 %if %{with odbc}
-%{__make} install -C ogdi/attr_driver/odbc \
+%{__make} -j 1 install -C ogdi/attr_driver/odbc \
        INST_LIB=$RPM_BUILD_ROOT%{_libdir}
 %endif
 
@@ -148,14 +152,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gltpd
 %attr(755,root,root) %{_bindir}/ogdi_*
 %attr(755,root,root) %{_libdir}/libogdi.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libogdi.so.3
 %dir %{_libdir}/ogdi
-%attr(755,root,root) %{_libdir}/ogdi/lib[!l]*.so
+%attr(755,root,root) %{_libdir}/ogdi/libadrg.so
+%attr(755,root,root) %{_libdir}/ogdi/libdtcanada.so
+%attr(755,root,root) %{_libdir}/ogdi/libdted.so
+%attr(755,root,root) %{_libdir}/ogdi/libdtusa.so
+%attr(755,root,root) %{_libdir}/ogdi/libgdal.so
+%attr(755,root,root) %{_libdir}/ogdi/libremote.so
+%attr(755,root,root) %{_libdir}/ogdi/librpf.so
+%attr(755,root,root) %{_libdir}/ogdi/libskeleton.so
+%attr(755,root,root) %{_libdir}/ogdi/libvrf.so
 
 %files devel
 %defattr(644,root,root,755)
 %doc ogdi.pdf
 %attr(755,root,root) %{_libdir}/libogdi.so
-%{_includedir}/*.h
+%{_includedir}/ecs.h
+%{_includedir}/ecs_util.h
 
 %if %{with odbc}
 %files odbc