[packages/proj] - added am patch (fixes build with automake 1.12 or so)

qboosh qboosh at pld-linux.org
Sat Sep 29 16:23:02 CEST 2012


commit dd50c3af07f9a5a099e662902dd99d9dda474f9e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 29 16:24:16 2012 +0200

    - added am patch (fixes build with automake 1.12 or so)

 proj-am.patch | 11 +++++++++++
 proj.spec     |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/proj.spec b/proj.spec
index b6e793c..7d472bf 100644
--- a/proj.spec
+++ b/proj.spec
@@ -14,6 +14,7 @@ Source0:	ftp://ftp.remotesensing.org/proj/%{name}-%{version}.tar.gz
 Source1:	ftp://ftp.remotesensing.org/proj/%{name}-pdf-docs.tar.gz
 # Source1-md5:	7c8f48f0fddf0d5730f4b27b3f09e6c1
 Patch0:		%{name}-missing.patch
+Patch1:		%{name}-am.patch
 URL:		http://www.remotesensing.org/proj/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -81,6 +82,7 @@ Dokumentacja do oprogramowania do rzutów kartograficznych proj.
 %prep
 %setup -q -a1
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/proj-am.patch b/proj-am.patch
new file mode 100644
index 0000000..8acf908
--- /dev/null
+++ b/proj-am.patch
@@ -0,0 +1,11 @@
+--- proj-4.8.0/src/Makefile.am.orig	2012-03-07 06:58:49.000000000 +0100
++++ proj-4.8.0/src/Makefile.am	2012-09-29 16:13:43.999686530 +0200
+@@ -65,7 +65,7 @@
+ 	jniproj.c pj_mutex.c pj_initcache.c pj_apply_vgridshift.c
+ 
+ 
+-install-exec-local:
++install-exec-hook:
+ 	rm -f $(DESTDIR)$(bindir)/invproj$(EXEEXT)
+ 	(cd $(DESTDIR)$(bindir); ln -s proj$(EXEEXT) invproj$(EXEEXT))
+ 	rm -f $(DESTDIR)$(bindir)/invgeod$(EXEEXT)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list