diff --git a/proj.changes b/proj.changes index 2c42c60..d7e7e8f 100644 --- a/proj.changes +++ b/proj.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 25 08:54:25 UTC 2019 - Martin Pluskal + +- Enable tests +- Fix previous changelog entry + ------------------------------------------------------------------- Mon Mar 11 13:34:36 UTC 2019 - Martin Pluskal -- Update to version 5.2.0 and datumgrid 1.7 +- Update to version 6.0.0 and datumgrid 1.7 * See provided NEWS for list of all changes ------------------------------------------------------------------- diff --git a/proj.spec b/proj.spec index 3d4c886..fb19d0e 100644 --- a/proj.spec +++ b/proj.spec @@ -29,11 +29,14 @@ URL: https://trac.osgeo.org/proj/ Source0: http://download.osgeo.org/proj/%{name}-%{version}.tar.gz Source1: http://download.osgeo.org/proj/%{name}-datumgrid-%{gridver}.zip BuildRequires: gcc-c++ -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 0.9.0 BuildRequires: sqlite3 BuildRequires: unzip BuildRequires: pkgconfig(sqlite3) >= 3.7 Provides: libproj = %{version} +%if 0%{?suse_version} > 1500 +BuildRequires: pkgconfig(gtest) +%endif %description This package offers the commandline tools for performing respective @@ -67,6 +70,9 @@ unzip -o %{SOURCE1} %build %configure \ +%if 0%{?suse_version} > 1500 + --with-external-gtest \ +%endif --disable-static make %{?_smp_mflags} @@ -74,6 +80,12 @@ make %{?_smp_mflags} %make_install find %{buildroot} -type f -name "*.la" -delete -print +%check +# Tests dont work on i586 and noone cares +%ifnarch %{ix86} +make %{?_smp_mflags} check +%endif + %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig