[packages/proj] - updated to 4.9.1 (note: new soname) - removed obsolete missing patch

[qboosh]

commit 992971c8cb8f4922a268ac76b667db1cac721674
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed May 20 17:18:56 2015 +0200

    - updated to 4.9.1 (note: new soname)
    - removed obsolete missing patch

 proj-missing.patch | 138 -----------------------------------------------------
 proj.spec          |  18 +++----
 2 files changed, 10 insertions(+), 146 deletions(-)
---
diff --git a/proj.spec b/proj.spec
index b166403..333efeb 100644
--- a/proj.spec
+++ b/proj.spec
@@ -5,16 +5,15 @@
 Summary:	Cartographic projection software
 Summary(pl.UTF-8):	Oprogramowanie do rzutów kartograficznych
 Name:		proj
-Version:	4.8.0
-Release:	3
+Version:	4.9.1
+Release:	1
 Group:		Libraries
 License:	MIT
 Source0:	ftp://ftp.remotesensing.org/proj/%{name}-%{version}.tar.gz
-# Source0-md5:	d815838c92a29179298c126effbb1537
+# Source0-md5:	3cbb2a964fd19a496f5f4265a717d31c
 Source1:	ftp://ftp.remotesensing.org/proj/%{name}-pdf-docs.tar.gz
 # Source1-md5:	7c8f48f0fddf0d5730f4b27b3f09e6c1
-Patch0:		%{name}-missing.patch
-Patch1:		%{name}-am.patch
+Patch0:		%{name}-am.patch
 URL:		http://www.remotesensing.org/proj/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -82,7 +81,6 @@ Dokumentacja do oprogramowania do rzutów kartograficznych proj.
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -111,14 +109,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libproj.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libproj.so.0
+%attr(755,root,root) %ghost %{_libdir}/libproj.so.9
 %dir %{_datadir}/proj
+%{_datadir}/proj/CH
 %{_datadir}/proj/GL27
 %{_datadir}/proj/IGNF
 %{_datadir}/proj/nad27
 %{_datadir}/proj/nad83
 %{_datadir}/proj/nad.lst
-%{_datadir}/proj/proj_def.dat
 %{_datadir}/proj/world
 %{_datadir}/proj/epsg
 %{_datadir}/proj/esri
@@ -129,9 +127,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libproj.so
 %{_libdir}/libproj.la
+%{_includedir}/geodesic.h
+%{_includedir}/org_proj4_PJ.h
 %{_includedir}/org_proj4_Projections.h
 %{_includedir}/proj_api.h
+%{_includedir}/projects.h
 %{_pkgconfigdir}/proj.pc
+%{_mandir}/man3/geodesic.3*
 %{_mandir}/man3/pj_init.3*
 
 %files static
diff --git a/proj-missing.patch b/proj-missing.patch
deleted file mode 100644
index a7ef723..0000000
--- a/proj-missing.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- proj-4.8.0/src/org_proj4_PJ.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ proj-4.8.0/src/org_proj4_PJ.h	2012-03-15 20:12:49.078886235 +0100
-@@ -0,0 +1,135 @@
-+/* DO NOT EDIT THIS FILE - it is machine generated */
-+#include <jni.h>
-+/* Header for class org_proj4_PJ */
-+
-+#ifndef _Included_org_proj4_PJ
-+#define _Included_org_proj4_PJ
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#undef org_proj4_PJ_DIMENSION_MAX
-+#define org_proj4_PJ_DIMENSION_MAX 100L
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    allocatePJ
-+ * Signature: (Ljava/lang/String;)J
-+ */
-+JNIEXPORT jlong JNICALL Java_org_proj4_PJ_allocatePJ
-+  (JNIEnv *, jclass, jstring);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    allocateGeoPJ
-+ * Signature: (Lorg/proj4/PJ;)J
-+ */
-+JNIEXPORT jlong JNICALL Java_org_proj4_PJ_allocateGeoPJ
-+  (JNIEnv *, jclass, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getVersion
-+ * Signature: ()Ljava/lang/String;
-+ */
-+JNIEXPORT jstring JNICALL Java_org_proj4_PJ_getVersion
-+  (JNIEnv *, jclass);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getDefinition
-+ * Signature: ()Ljava/lang/String;
-+ */
-+JNIEXPORT jstring JNICALL Java_org_proj4_PJ_getDefinition
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getType
-+ * Signature: ()Lorg/proj4/PJ$Type;
-+ */
-+JNIEXPORT jobject JNICALL Java_org_proj4_PJ_getType
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getSemiMajorAxis
-+ * Signature: ()D
-+ */
-+JNIEXPORT jdouble JNICALL Java_org_proj4_PJ_getSemiMajorAxis
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getSemiMinorAxis
-+ * Signature: ()D
-+ */
-+JNIEXPORT jdouble JNICALL Java_org_proj4_PJ_getSemiMinorAxis
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getEccentricitySquared
-+ * Signature: ()D
-+ */
-+JNIEXPORT jdouble JNICALL Java_org_proj4_PJ_getEccentricitySquared
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getAxisDirections
-+ * Signature: ()[C
-+ */
-+JNIEXPORT jcharArray JNICALL Java_org_proj4_PJ_getAxisDirections
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getGreenwichLongitude
-+ * Signature: ()D
-+ */
-+JNIEXPORT jdouble JNICALL Java_org_proj4_PJ_getGreenwichLongitude
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getLinearUnitToMetre
-+ * Signature: (Z)D
-+ */
-+JNIEXPORT jdouble JNICALL Java_org_proj4_PJ_getLinearUnitToMetre
-+  (JNIEnv *, jobject, jboolean);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    transform
-+ * Signature: (Lorg/proj4/PJ;I[DII)V
-+ */
-+JNIEXPORT void JNICALL Java_org_proj4_PJ_transform
-+  (JNIEnv *, jobject, jobject, jint, jdoubleArray, jint, jint);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    getLastError
-+ * Signature: ()Ljava/lang/String;
-+ */
-+JNIEXPORT jstring JNICALL Java_org_proj4_PJ_getLastError
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    toString
-+ * Signature: ()Ljava/lang/String;
-+ */
-+JNIEXPORT jstring JNICALL Java_org_proj4_PJ_toString
-+  (JNIEnv *, jobject);
-+
-+/*
-+ * Class:     org_proj4_PJ
-+ * Method:    finalize
-+ * Signature: ()V
-+ */
-+JNIEXPORT void JNICALL Java_org_proj4_PJ_finalize
-+  (JNIEnv *, jobject);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
================================================================

---- gitweb:

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