[packages/proj: 2/2] Merge remote-tracking branch 'origin/DEVEL-proj-5'

[qboosh]

commit 913a9043e3bb876b2f9df4d03ac396cce5d2f07e
Merge: 41a2f66 232f8f8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 31 20:54:03 2019 +0200

    Merge remote-tracking branch 'origin/DEVEL-proj-5'

 proj.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --cc proj.spec
index 274b9bf,0826a99..d70dee0
--- a/proj.spec
+++ b/proj.spec
@@@ -155,10 -154,10 +155,10 @@@ rm -rf $RPM_BUILD_ROO
  %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/cs2cs.1*
  %{_mandir}/man1/cct.1*
+ %{_mandir}/man1/cs2cs.1*
  %{_mandir}/man1/geod.1*
  %{_mandir}/man1/gie.1*
  %{_mandir}/man1/proj.1*
================================================================

---- gitweb:

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