From 903e84f24115648c88771b007c4bcd8bc8caad27 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 14 Mar 2022 23:53:42 +0100
Subject: [PATCH] Update to 1.7.1

---
 .gitignore             |  1 +
 libgeotiff.spec        |  9 +++++---
 libgeotiff_cmake.patch | 48 ++++++++++++------------------------------
 sources                |  2 +-
 4 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3972c05..7de9efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libgeotiff-1.5.1.tar.gz
 /libgeotiff-1.6.0.tar.gz
 /libgeotiff-1.7.0.tar.gz
+/libgeotiff-1.7.1.tar.gz
diff --git a/libgeotiff.spec b/libgeotiff.spec
index 60cc270..664bfda 100644
--- a/libgeotiff.spec
+++ b/libgeotiff.spec
@@ -1,6 +1,6 @@
 Name:          libgeotiff
-Version:       1.7.0
-Release:       8%{?dist}
+Version:       1.7.1
+Release:       1%{?dist}
 
 Summary:       GeoTIFF format library
 License:       MIT
@@ -95,7 +95,7 @@ BuildArch:     noarch
 
 %build
 # Native build
-%cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name}
+%cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name} -DGEOTIFF_LIB_SUBDIR=%{_lib}
 %cmake_build
 
 # MinGW build
@@ -203,6 +203,9 @@ EOF
 
 
 %changelog
+* Mon Mar 14 2022 Sandro Mani <manisandro@gmail.com> - 1.7.1-1
+- Update to 1.7.1
+
 * Wed Mar 09 2022 Sandro Mani <manisandro@gmail.com> - 1.7.0-8
 - Rebuild for proj-9.0.0
 
diff --git a/libgeotiff_cmake.patch b/libgeotiff_cmake.patch
index 2ccc9de..54464b8 100644
--- a/libgeotiff_cmake.patch
+++ b/libgeotiff_cmake.patch
@@ -1,6 +1,6 @@
-diff -rupN libgeotiff-1.7.0/cmake/CMakeLists.txt libgeotiff-1.7.0-new/cmake/CMakeLists.txt
---- libgeotiff-1.7.0/cmake/CMakeLists.txt	2021-03-06 18:47:06.000000000 +0100
-+++ libgeotiff-1.7.0-new/cmake/CMakeLists.txt	2022-02-20 01:14:12.921648760 +0100
+diff -rupN --no-dereference libgeotiff-1.7.1/cmake/CMakeLists.txt libgeotiff-1.7.1-new/cmake/CMakeLists.txt
+--- libgeotiff-1.7.1/cmake/CMakeLists.txt	2022-02-18 16:07:34.000000000 +0100
++++ libgeotiff-1.7.1-new/cmake/CMakeLists.txt	2022-03-14 23:38:20.294077484 +0100
 @@ -6,13 +6,8 @@
  # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
  # path to the root from there.  (Note that the whole install tree can
@@ -17,11 +17,11 @@ diff -rupN libgeotiff-1.7.0/cmake/CMakeLists.txt libgeotiff-1.7.0-new/cmake/CMak
  
  configure_file (project-config.cmake.in project-config.cmake @ONLY)
  configure_file (project-config-version.cmake.in
-diff -rupN libgeotiff-1.7.0/CMakeLists.txt libgeotiff-1.7.0-new/CMakeLists.txt
---- libgeotiff-1.7.0/CMakeLists.txt	2021-06-30 10:51:17.000000000 +0200
-+++ libgeotiff-1.7.0-new/CMakeLists.txt	2022-02-20 01:12:42.518986798 +0100
-@@ -285,9 +285,9 @@ SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUD
- SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR})
+diff -rupN --no-dereference libgeotiff-1.7.1/CMakeLists.txt libgeotiff-1.7.1-new/CMakeLists.txt
+--- libgeotiff-1.7.1/CMakeLists.txt	2022-03-10 09:32:14.000000000 +0100
++++ libgeotiff-1.7.1-new/CMakeLists.txt	2022-03-14 23:38:20.295077481 +0100
+@@ -261,9 +261,9 @@ SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR
+ SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR})
  
  # Install doc files
 -INSTALL(FILES
@@ -30,38 +30,16 @@ diff -rupN libgeotiff-1.7.0/CMakeLists.txt libgeotiff-1.7.0-new/CMakeLists.txt
 +#INSTALL(FILES
 +    #AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
 +    #DESTINATION doc)
- #    DESTINATION ${GEOTIFF_DATA_DIR}/doc)
  
  # Install man pages
-@@ -295,8 +295,8 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTI
+ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
+@@ -329,6 +329,9 @@ endif()
  
- 
- # Install header files for development distribution
--# INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
--INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)
-+INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
-+#INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)
- 
- ###############################################################################
- # Build libxtiff library
-@@ -358,6 +358,9 @@ ELSE(UNIX)
-    SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
+ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
     OUTPUT_NAME ${GEOTIFF_LIB_NAME})
- ENDIF(UNIX)
 +IF(MINGW)
 +    SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES SUFFIX "-${LINK_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 +ENDIF(MINGW)
  
- SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
-    OUTPUT_NAME ${GEOTIFF_LIB_NAME})
-@@ -376,8 +379,8 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_
- INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
- 	 EXPORT depends
- 	 RUNTIME DESTINATION bin
--         LIBRARY DESTINATION lib
--	 ARCHIVE DESTINATION lib )
-+         LIBRARY DESTINATION lib${LIB_SUFFIX}
-+	 ARCHIVE DESTINATION lib${LIB_SUFFIX} )
- 
- # Define grouping of source files in PROJECT file (e.g. Visual Studio)
- SOURCE_GROUP("CMake Files" FILES CMakeLists.txt)
+ set(CONFIG_DEPENDENCIES "")
+ if(TARGET TIFF::TIFF)
diff --git a/sources b/sources
index 888999e..5df24e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libgeotiff-1.7.0.tar.gz) = 8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
+SHA512 (libgeotiff-1.7.1.tar.gz) = af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1