packages: proj/proj.spec, proj/proj-missing.patch (NEW)=?UTF-8?Q?=20?=- updated to 4.8.0 ...

Thu Mar 15 21:03:56 CET 2012

Author: qboosh                       Date: Thu Mar 15 20:03:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 4.8.0
- added missing patch (with missing org_proj4_PJ.h file taken from git)

---- Files affected:
packages/proj:
   proj.spec (1.27 -> 1.28) , proj-missing.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/proj/proj.spec
diff -u packages/proj/proj.spec:1.27 packages/proj/proj.spec:1.28

--- packages/proj/proj.spec:1.27	Wed Jul  7 19:19:07 2010
+++ packages/proj/proj.spec	Thu Mar 15 21:03:51 2012
@@ -1,18 +1,24 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	java	# Java/JNI support
+#
 Summary:	Cartographic projection software
 Summary(pl.UTF-8):	Oprogramowanie do rzutów kartograficznych
 Name:		proj
-Version:	4.7.0
+Version:	4.8.0
 Release:	1
 Group:		Libraries
 License:	MIT
 Source0:	ftp://ftp.remotesensing.org/proj/%{name}-%{version}.tar.gz
-# Source0-md5:	927d34623b52e0209ba2bfcca18fe8cd
+# Source0-md5:	d815838c92a29179298c126effbb1537
 Source1:	ftp://ftp.remotesensing.org/proj/%{name}-pdf-docs.tar.gz
 # Source1-md5:	7c8f48f0fddf0d5730f4b27b3f09e6c1
+Patch0:		%{name}-missing.patch
 URL:		http://www.remotesensing.org/proj/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
+%{?with_java:BuildRequires:	jdk}
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,6 +81,7 @@
 
 %prep
 %setup -q -a1
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -82,13 +89,13 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{!?with_java:--without-jni}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -121,10 +128,9 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libproj.so
 %{_libdir}/libproj.la
-%{_includedir}/nad_list.h
 %{_includedir}/org_proj4_Projections.h
 %{_includedir}/proj_api.h
-%{_includedir}/projects.h
+%{_pkgconfigdir}/proj.pc
 %{_mandir}/man3/pj_init.3*
 
 %files static
@@ -138,11 +144,9 @@
 %attr(755,root,root) %{_bindir}/invgeod
 %attr(755,root,root) %{_bindir}/invproj
 %attr(755,root,root) %{_bindir}/nad2bin
-%attr(755,root,root) %{_bindir}/nad2nad
 %attr(755,root,root) %{_bindir}/proj
 %{_mandir}/man1/cs2cs.1*
 %{_mandir}/man1/geod.1*
-%{_mandir}/man1/nad2nad.1*
 %{_mandir}/man1/proj.1*
 
 %files doc
@@ -155,6 +159,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2012/03/15 20:03:51  qboosh
+- updated to 4.8.0
+- added missing patch (with missing org_proj4_PJ.h file taken from git)
+
 Revision 1.27  2010/07/07 17:19:07  jajcus
 - make the install directory, so inv* links are properly installed
 

================================================================
Index: packages/proj/proj-missing.patch
diff -u /dev/null packages/proj/proj-missing.patch:1.1
--- /dev/null	Thu Mar 15 21:03:56 2012
+++ packages/proj/proj-missing.patch	Thu Mar 15 21:03:51 2012
@@ -0,0 +1,138 @@
+--- 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/proj/proj.spec?r1=1.27&r2=1.28&f=u

