diff --git a/fedora/SPECS/gdal.spec b/fedora/SPECS/gdal.spec index 4bb621c..f86dab5 100644 --- a/fedora/SPECS/gdal.spec +++ b/fedora/SPECS/gdal.spec @@ -1,9 +1,8 @@ -%define build_refman 1 %define bashcompletiondir %{_sysconfdir}/bash_completion.d Name: gdal Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} #define debug_package #{nil} License: MIT Group: Applications/System @@ -12,11 +11,9 @@ URL: http://www.gdal.org Source0: %name-%{version}.tar.gz -#BuildRequires: armadillo-devel BuildRequires: freexl-devel BuildRequires: bash-completion BuildRequires: libzstd-devel -#BuildRequires: cfitsio-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -39,14 +36,8 @@ BuildRequires: python3-numpy %endif BuildRequires: sqlite-devel BuildRequires: swig -%if %{build_refman} -BuildRequires: texlive-latex -BuildRequires: texlive-collection-fontsrecommended -%if 0%{?fedora} -BuildRequires: texlive-collection-langcyrillic -BuildRequires: texlive-collection-langportuguese -%endif -%endif + +Obsoletes: gdal < 3 %global DONT_REMOVE_RPATH 1 # don't check for rpath: @@ -84,16 +75,35 @@ This package contains the GDAL file format library. %setup -q -n %{name}-%{version} %build -%configure \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ +./configure \ + --datadir=%{_datadir}/%{name} \ --includedir=%{_includedir}/%{name} \ - --datadir=%{_datadir}/%{name} + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --sysconfdir=%{_sysconfdir} \ + --localstatedir=%{_var} \ + --with-curl \ + --with-freexl \ + --with-geos \ + --with-png=%{_prefix} \ + --with-gif \ + --with-gta \ + --with-jpeg \ + --without-jpeg12 \ + --with-liblzma \ + --with-libtiff=%{_prefix} \ + --with-libz \ + --without-mdb \ + --without-msg \ + --with-proj \ + --with-threads \ + --enable-shared + make %install export DONT_REMOVE_RPATH=1 -%make_install +make install DESTDIR=%{buildroot} # move bashcompletion file to proper directory: mv %{buildroot}%{_prefix}/etc %{buildroot}/ @@ -144,6 +154,9 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 8 2020 Daniel Steiner +- Library path fixed. + * Mon Jan 6 2020 Daniel Steiner - Initial build