[packages/proj] - release 2, build and package nad2bin

adamg adamg at pld-linux.org
Sun Apr 7 12:25:15 CEST 2019


commit b4545e9f195d529cf04e617dbefad6d4ec30f101
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Sun Apr 7 12:25:08 2019 +0200

    - release 2, build and package nad2bin

 proj.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/proj.spec b/proj.spec
index d70dee0..67364c4 100644
--- a/proj.spec
+++ b/proj.spec
@@ -6,13 +6,15 @@ Summary:	Cartographic projection software
 Summary(pl.UTF-8):	Oprogramowanie do rzutów kartograficznych
 Name:		proj
 Version:	6.0.0
-Release:	1
+Release:	2
 Group:		Libraries
 License:	MIT
 Source0:	http://download.osgeo.org/proj/%{name}-%{version}.tar.gz
 # Source0-md5:	08cd21c95e530cd01c5cf58e9f32483a
 Source1:	http://download.osgeo.org/proj/%{name}-pdf-docs.tar.gz
 # Source1-md5:	7c8f48f0fddf0d5730f4b27b3f09e6c1
+Source2:	https://raw.githubusercontent.com/OSGeo/proj-datumgrid/master/scripts/nad2bin.c
+# Source2-md5:	d061e9107864c06c997cda0910de81bc
 Patch0:		%{name}-am.patch
 URL:		http://proj4.org/
 BuildRequires:	autoconf >= 2.59
@@ -84,6 +86,7 @@ Dokumentacja do oprogramowania do rzutów kartograficznych proj.
 %prep
 %setup -q -a1
 %patch0 -p1
+cp %{SOURCE2} .
 
 %build
 %{__libtoolize}
@@ -96,12 +99,17 @@ Dokumentacja do oprogramowania do rzutów kartograficznych proj.
 
 %{__make}
 
+# build nad2bin, removed from proj but required by e.g. grass.spec
+%{__cc} %{rpmcflags} %{rpmldflags} -o nad2bin nad2bin.c
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install nad2bin $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -155,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gie
 %attr(755,root,root) %{_bindir}/invgeod
 %attr(755,root,root) %{_bindir}/invproj
+%attr(755,root,root) %{_bindir}/nad2bin
 %attr(755,root,root) %{_bindir}/proj
 %attr(755,root,root) %{_bindir}/projinfo
 %{_mandir}/man1/cct.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/proj.git/commitdiff/b4545e9f195d529cf04e617dbefad6d4ec30f101



More information about the pld-cvs-commit mailing list