[packages/liblas] - adjusted pkgconfig patch for lack of geotiff pc file

[qboosh]

commit 83a9610389c14d64fc5d0aa30f42ba38d69df8e0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 13 21:47:54 2020 +0100

    - adjusted pkgconfig patch for lack of geotiff pc file

 liblas-pkgconfig.patch | 18 ++++++++++++++----
 liblas.spec            |  3 +++
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/liblas.spec b/liblas.spec
index b40d143..53ddcad 100644
--- a/liblas.spec
+++ b/liblas.spec
@@ -64,6 +64,9 @@ Summary:	Header files for libLAS library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libLAS
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_gdal:Requires:	gdal-devel >= 1.7.0}
+Requires:	libgeotiff-devel >= 1.3.0
+Requires:	libstdc++-devel
 
 %description devel
 Header files for libLAS library.
diff --git a/liblas-pkgconfig.patch b/liblas-pkgconfig.patch
index 5ee8601..2cc1616 100644
--- a/liblas-pkgconfig.patch
+++ b/liblas-pkgconfig.patch
@@ -1,7 +1,6 @@
-diff -rupN --no-dereference libLAS-d76a061f33a69a36ab116cd939c5d444b301efd8/apps/CMakeLists.txt libLAS-d76a061f33a69a36ab116cd939c5d444b301efd8-new/apps/CMakeLists.txt
 --- libLAS-d76a061f33a69a36ab116cd939c5d444b301efd8/apps/CMakeLists.txt	2020-04-05 18:40:29.000000000 +0200
 +++ libLAS-d76a061f33a69a36ab116cd939c5d444b301efd8-new/apps/CMakeLists.txt	2020-06-08 11:37:26.939014590 +0200
-@@ -195,8 +195,8 @@ if(UNIX)
+@@ -181,17 +181,18 @@ if(UNIX)
    if(WITH_PKGCONFIG)
  
      set(PKGCFG_PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -12,12 +11,23 @@ diff -rupN --no-dereference libLAS-d76a061f33a69a36ab116cd939c5d444b301efd8/apps
      set(PKGCFG_REQUIRES  "")
      set(PKGCFG_VERSION ${VERSION})
      set(PKGCFG_LINK_FLAGS "-llas -llas_c")
-@@ -205,7 +205,7 @@ if(UNIX)
+     set(PKGCFG_COMPILE_FLAGS "")
++    set(PKGCFG_LINK_FLAGS_PRIVATE "")
+     if(LIBXML2_FOUND)
        set(PKGCFG_REQUIRES "${PKGCFG_REQUIRES} libxml-2.0")
      endif()
      if(GEOTIFF_FOUND)
 -      set(PKGCFG_REQUIRES "${PKGCFG_REQUIRES} geotiff")
-+      set(PKGCFG_REQUIRES "${PKGCFG_REQUIRES} libgeotiff")
++      set(PKGCFG_LINK_FLAGS_PRIVATE "${PKGCFG_LINK_FLAGS_PRIVATE} -lgeotiff")
      endif()
      #  if(WITH_GDAL)
      #    set(PKGCFG_INC_DIR "${PKGCFG_INC_DIR} ${GDAL_INCLUDE_DIR}")
+--- libLAS-1.8.1/apps/liblas.pc.in.orig	2016-08-22 15:06:34.000000000 +0200
++++ libLAS-1.8.1/apps/liblas.pc.in	2020-12-13 21:36:52.293513244 +0100
+@@ -8,5 +8,6 @@
+ Requires: @PKGCFG_REQUIRES@
+ Version: @PKGCFG_VERSION@
+ Libs: -L${libdir} @PKGCFG_LINK_FLAGS@
++Libs.private: @PKGCFG_LINK_FLAGS_PRIVATE@
+ Cflags: -I${includedir}/liblas @PKGCFG_COMPILE_FLAGS@
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/liblas.git/commitdiff/83a9610389c14d64fc5d0aa30f42ba38d69df8e0