Upgrade: libgeotiff version to 1.7.3 (#13696)

Author: durgajagadeesh

SPECS-EXTENDED/libgeotiff/libgeotiff.signatures.json

@@ -1,5 +1,6 @@
 {
  "Signatures": {
-  "libgeotiff-1.7.1.tar.gz": "05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6"
+  "libgeotiff-1.7.3.tar.gz": "ba23a3a35980ed3de916e125c739251f8e3266be07540200125a307d7cf5a704"
  }
 }
+

SPECS-EXTENDED/libgeotiff/libgeotiff.spec

@@ -1,24 +1,27 @@
-Summary:        GeoTIFF format library
-Name:           libgeotiff
-Version:        1.7.1
-Release:        5%{?dist}
-License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
-URL:            https://trac.osgeo.org/geotiff/
-Source:         https://download.osgeo.org/geotiff/%{name}/%{name}-%{version}.tar.gz
+
+Name:          libgeotiff
+Version:       1.7.3
+Release:       4%{?dist}
+
+Summary:       GeoTIFF format library
+License:       MIT
+URL:           https://trac.osgeo.org/geotiff/
+Source:        https://download.osgeo.org/geotiff/%{name}/%{name}-%{version}.tar.gz
 # Honour LIB_SUFFIX
 # Honour GEOTIFF_INCLUDE_SUBDIR
 # Add version suffix to mingw library
 # Fix cmake module install dir
 # Don't install docs
-Patch0:         libgeotiff_cmake.patch
-BuildRequires:  cmake
-BuildRequires:  gcc-c++
-BuildRequires:  libjpeg-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  proj-devel
-BuildRequires:  zlib-devel
+Patch0:        libgeotiff_cmake.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: libtiff-devel
+BuildRequires: libjpeg-devel
+BuildRequires: proj-devel
+BuildRequires: zlib-devel
 
 %description
 GeoTIFF represents an effort by over 160 different remote sensing,
@@ -27,28 +30,25 @@ to establish a TIFF based interchange format for georeferenced
 raster imagery.
 
 %package devel
-Summary:        Development library and header for the GeoTIFF file format library
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       libtiff-devel
-Requires:       pkgconfig
+Summary:	Development library and header for the GeoTIFF file format library
+Requires:	pkgconfig libtiff-devel
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The GeoTIFF library provides support for development of geotiff image format.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}
 
-
 %build
 # Native build
-%cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name} -DGEOTIFF_LIB_SUBDIR=%{_lib}
+%cmake -DGEOTIFF_BIN_SUBDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name}
 %cmake_build
 
 
 %install
 %cmake_install
 
-
 # install pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 cat > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc <<EOF
@@ -59,15 +59,14 @@ includedir=%{_includedir}/%{name}
 
 Name: %{name}
 Description: GeoTIFF file format library
-Version: %{version}
+Version: 1.7.3
 Libs: -L\${libdir} -lgeotiff
 Cflags: -I\${includedir}
 EOF
 
 %check
 %ctest
 
-
 %files
 %license LICENSE
 %doc ChangeLog
@@ -85,10 +84,45 @@ EOF
 %{_libdir}/cmake/GeoTIFF/
 
 %changelog
-* Wed Aug 09 2023 Archana Choudhary <archana1@microsoft.com> - 1.7.1-5
-- Initial CBL-Mariner import from Fedora 37 (license: MIT)
+* Wed May 07 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 1.7.3-4
+- Initial Azure Linux import from Fedora 41 (license: MIT)
 - License verified
-- Remove mingw build conditional execution statements
+
+* Thu Apr 17 2025 Sandro Mani <manisandro@gmail.com> - 1.7.3-3
+- Rebuild against correct crt
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat May 25 2024 Sandro Mani <manisandro@gmail.com> - 1.7.3-1
+- Update to 1.7.3
+
+* Tue Mar 05 2024 Sandro Mani <manisandro@gmail.com> - 1.7.1-13
+- Rebuild (proj)
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Sep 03 2023 Sandro Mani <manisandro@gmail.com> - 1.7.1-10
+- Rebuild (proj)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu May 18 2023 Orion Poplawski <orion@nwra.com> - 1.7.1-8
+- Change BR to mingw*-gcc-c++
+
+* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 1.7.1-7
+- Rebuild (proj)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Sep 04 2022 Sandro Mani <manisandro@gmail.com> - 1.7.1-5
+- Rebuild (proj)
 
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

SPECS-EXTENDED/libgeotiff/libgeotiff_cmake.patch

@@ -1,6 +1,6 @@
-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
+diff -rupN libgeotiff-1.7.3/cmake/CMakeLists.txt libgeotiff-1.7.3-new/cmake/CMakeLists.txt
+--- libgeotiff-1.7.3/cmake/CMakeLists.txt	2022-02-18 16:07:34.000000000 +0100
++++ libgeotiff-1.7.3-new/cmake/CMakeLists.txt	2024-05-25 11:33:17.823041296 +0200
 @@ -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,29 +17,29 @@ diff -rupN --no-dereference libgeotiff-1.7.1/cmake/CMakeLists.txt libgeotiff-1.7
 
  configure_file (project-config.cmake.in project-config.cmake @ONLY)
  configure_file (project-config-version.cmake.in
-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})
+diff -rupN libgeotiff-1.7.3/CMakeLists.txt libgeotiff-1.7.3-new/CMakeLists.txt
+--- libgeotiff-1.7.3/CMakeLists.txt	2024-05-24 15:38:59.000000000 +0200
++++ libgeotiff-1.7.3-new/CMakeLists.txt	2024-05-25 11:35:20.294177785 +0200
+@@ -244,9 +244,9 @@ SET(GEOTIFF_MAN_PAGES
+ #    ${PROJECT_BINARY_DIR}/geotiff_version.h
 
  # Install doc files
 -INSTALL(FILES
--    AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
--    DESTINATION doc)
-+#INSTALL(FILES
-+    #AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
-+    #DESTINATION doc)
+-    AUTHORS ChangeLog COPYING LICENSE README README_BIN README.WIN
+-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
++# INSTALL(FILES
++    # AUTHORS ChangeLog COPYING LICENSE README README_BIN README.WIN
++    # DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
  # Install man pages
- INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
-@@ -329,6 +329,9 @@ endif()
+ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+@@ -312,6 +312,9 @@ endif()
 
  SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
     OUTPUT_NAME ${GEOTIFF_LIB_NAME})
 +IF(MINGW)
 +    SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES SUFFIX "-${LINK_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 +ENDIF(MINGW)
 
- set(CONFIG_DEPENDENCIES "")
- if(TARGET TIFF::TIFF)
+ set(CONFIG_PUBLIC_DEPENDENCIES "")
+ set(CONFIG_PRIVATE_DEPENDENCIES "")

cgmanifest.json

@@ -9581,8 +9581,8 @@
         "type": "other",
         "other": {
           "name": "libgeotiff",
-          "version": "1.7.1",
-          "downloadUrl": "https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.7.1.tar.gz"
+          "version": "1.7.3",
+          "downloadUrl": "https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.7.3.tar.gz"
         }
       }
     },