proj 8.2.1-3 (aarch64) 2022-15007
0
Status | rejected | ||||||||||||||||||||||||||||||||||
Submitter | benbullard79 [@T] cox.net | ||||||||||||||||||||||||||||||||||
Platform | 4.3 | ||||||||||||||||||||||||||||||||||
Repository | main | ||||||||||||||||||||||||||||||||||
URL | https://abf.openmandriva.org/build_lists/205998 | ||||||||||||||||||||||||||||||||||
Packages |
|
||||||||||||||||||||||||||||||||||
Build Date | 2022-05-17 11:20:59 +0000 UTC | ||||||||||||||||||||||||||||||||||
Last Updated | 2022-05-18 01:51:57.377335432 +0000 UTC |
$ git show --format=fuller --patch-with-stat --summary 44da8c2dabe2b63915d3af0e4ad8da1c2d07f942 commit 44da8c2dabe2b63915d3af0e4ad8da1c2d07f942 Author: mandian <mandian@users.noreply.github.com> AuthorDate: Fri Apr 22 20:34:11 2022 +0100 Commit: mandian <mandian@users.noreply.github.com> CommitDate: Fri Apr 22 20:34:11 2022 +0100 fix data and tests --- proj.spec | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 83 insertions(+), 8 deletions(-) diff --git a/proj.spec b/proj.spec index 1859c59..a1ba156 100644 --- a/proj.spec +++ b/proj.spec @@ -33,7 +33,7 @@ Cartographic projection software and libraries. %files %doc AUTHORS COPYING ChangeLog README -%doc %{_docdir}/proj/NEWS +%doc %{_docdir}/%{name}/NEWS %{_bindir}/* %{_mandir}/man1/* @@ -49,7 +49,25 @@ Proj arch independent data files. %files data %license %{_docdir}/%{name}/COPYING %dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +%{_datadir}/%{name}/CH +%{_datadir}/%{name}/GL27 +%{_datadir}/%{name}/ITRF2000 +%{_datadir}/%{name}/ITRF2008 +%{_datadir}/%{name}/ITRF2014 +%{_datadir}/%{name}/nad.lst +%{_datadir}/%{name}/nad27 +%{_datadir}/%{name}/nad83 +%{_datadir}/%{name}/other.extra +%{_datadir}/%{name}/%{name}.db +%{_datadir}/%{name}/%{name}.db-shm +%{_datadir}/%{name}/%{name}.db-wal +%{_datadir}/%{name}/%{name}.ini +%{_datadir}/%{name}/world +%{_datadir}/%{name}/README.DATA +%{_datadir}/%{name}/copyright_and_licenses.csv +%{_datadir}/%{name}/deformation_model.schema.json +%{_datadir}/%{name}/projjson.schema.json +%{_datadir}/%{name}/triangulation.schema.json #------------------------------------------------------------------------- @@ -64,7 +82,7 @@ Group: System/Libraries Cartographic projection software and libraries. %files -n %{libname} -%{_libdir}/libproj.so.%{major}* +%{_libdir}/lib%{name}.so.%{major}* #------------------------------------------------------------------------- @@ -79,11 +97,61 @@ Cartographic projection development files. %files -n %{devname} %{_includedir}/*.h -%{_includedir}/proj/*.hpp +%{_includedir}/%{name}/*.hpp %{_libdir}/*.so -%{_libdir}/pkgconfig/proj.pc -%{_libdir}/cmake/proj -%{_libdir}/cmake/proj4 +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name} +%{_libdir}/cmake/%{name}4 + +#------------------------------------------------------------------------- + +%define data_subpkg(c:n:e:s:) \ +%define countrycode %{-c:%{-c*}}%{!-c:%{error:Country code not defined}} \ +%define countryname %{-n:%{-n*}}%{!-n:%{error:Country name not defined}} \ +%define extrafile %{-e:%{_datadir}/%{name}/%{-e*}} \ +%define wildcard %{!-s:%{_datadir}/%{name}/%{countrycode}_*} \ +\ +%package data-%{countrycode}\ +Summary: %{countryname} datum grids for Proj\ +BuildArch: noarch\ +# See README.DATA \ +License: CC-BY and MIT and BSD and Public Domain \ +Requires: proj-data = %{version}-%{release} \ +Supplements: proj\ +\ +%description data-%{countrycode}\ +%{countryname} datum grids for Proj.\ +\ +%files data-%{countrycode}\ +%{wildcard}\ +%{extrafile} + +%data_subpkg -c at -n Austria +%data_subpkg -c au -n Australia +%data_subpkg -c be -n Belgium +%data_subpkg -c br -n Brasil +%data_subpkg -c ca -n Canada +%data_subpkg -c ch -n Switzerland +%data_subpkg -c de -n Germany +%data_subpkg -c dk -n Denmark -e DK +%data_subpkg -c es -n Spain +%data_subpkg -c eur -n %{quote:Nordic + Baltic} -e NKG +%data_subpkg -c fi -n Finland +%data_subpkg -c fo -n %{quote:Faroe Island} -e FO -s 1 +%data_subpkg -c fr -n France +%data_subpkg -c is -n Island -e ISL +%data_subpkg -c jp -n Japan +%data_subpkg -c mx -n Mexico +%data_subpkg -c no -n Norway +%data_subpkg -c nc -n %{quote:New Caledonia} +%data_subpkg -c nl -n Netherlands +%data_subpkg -c nz -n %{quote:New Zealand} +%data_subpkg -c pt -n Portugal +%data_subpkg -c se -n Sweden +%data_subpkg -c sk -n Slovakia +%data_subpkg -c uk -n %{quote:United Kingdom} +%data_subpkg -c us -n %{quote:United States} +%data_subpkg -c za -n %{quote:South Africa} #------------------------------------------------------------------------- @@ -100,6 +168,13 @@ Cartographic projection development files. %install %ninja_install -C build +# omdv sqlite forced to use WAL journal for db files +# and beacuse the fyle-system at runtime will be +# read-only we should prodive -shm and -wal file now, +# even if they are empty. More info at +# https://sqlite.org/wal.html#read_only_databases +touch %{buildroot}%{_datadir}/%{name}/%{name}.db{-shm,-wal} + # data install -dm 0755 %{buildroot}%{_datadir}/%{name} tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} @@ -107,6 +182,6 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %check # nkg test requires internet connection pushd build/test -ctest -- -E nkg +LD_LIBRARY_PATH=%{buildroot}%{_libdir} ctest -- -E nkg popd
Not Available
benbullard79 [@T] cox.net | No Comment. | 921d 06hrs |