4 changed files with 26 additions and 86 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,3 @@
 /libgeotiff-1.6.0.tar.gz
 /libgeotiff-1.7.0.tar.gz
 /libgeotiff-1.7.1.tar.gz
-/libgeotiff-1.7.3.tar.gz
--- a/libgeotiff.spec
+++ b/libgeotiff.spec
@ -1,11 +1,5 @@
-%if 0%{?rhel} >= 9
-%bcond_with mingw
-%else
-%bcond_without mingw
-%endif
-
 Name:          libgeotiff
-Version:       1.7.3
+Version:       1.7.1
 Release:       2%{?dist}

 Summary:       GeoTIFF format library
@ -26,21 +20,19 @@ BuildRequires: libjpeg-devel
 BuildRequires: proj-devel
 BuildRequires: zlib-devel

-%if %{with mingw}
 BuildRequires: mingw32-filesystem >= 95
-BuildRequires: mingw32-gcc-c++
+BuildRequires: mingw32-gcc
 BuildRequires: mingw32-libtiff
 BuildRequires: mingw32-libjpeg
 BuildRequires: mingw32-proj
 BuildRequires: mingw32-zlib

 BuildRequires: mingw64-filesystem >= 95
-BuildRequires: mingw64-gcc-c++
+BuildRequires: mingw64-gcc
 BuildRequires: mingw64-libtiff
 BuildRequires: mingw64-libjpeg
 BuildRequires: mingw64-proj
 BuildRequires: mingw64-zlib
-%endif


 %description
@ -58,7 +50,6 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 The GeoTIFF library provides support for development of geotiff image format.


-%if %{with mingw}
 %package -n mingw32-%{name}
 Summary:       MinGW Windows %{name} library
 Obsoletes:     mingw32-%{name}-static
@ -96,7 +87,6 @@ BuildArch:     noarch


 %{?mingw_debug_package}
-%endif


 %prep
@ -105,23 +95,17 @@ BuildArch:     noarch

 %build
 # Native build
-%cmake -DGEOTIFF_BIN_SUBDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name}
+%cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name} -DGEOTIFF_LIB_SUBDIR=%{_lib}
 %cmake_build

-%if %{with mingw}
 # MinGW build
-MINGW32_CMAKE_ARGS=-DCMAKE_INSTALL_INCLUDEDIR=%{mingw32_includedir}/%{name} \
-MINGW64_CMAKE_ARGS=-DCMAKE_INSTALL_INCLUDEDIR=%{mingw64_includedir}/%{name} \
-%mingw_cmake
+%mingw_cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name}
 %mingw_make_build
-%endif


 %install
 %cmake_install
-%if %{with mingw}
 %mingw_make_install
-%endif


 # install pkgconfig file
@ -134,12 +118,11 @@ includedir=%{_includedir}/%{name}

 Name: %{name}
 Description: GeoTIFF file format library
-Version: 1.7.3
+Version: %{version}
 Libs: -L\${libdir} -lgeotiff
 Cflags: -I\${includedir}
 EOF

-%if %{with mingw}
 mkdir -p %{buildroot}%{mingw32_libdir}/pkgconfig/
 cat > %{buildroot}%{mingw32_libdir}/pkgconfig/%{name}.pc <<EOF
 prefix=%{mingw32_prefix}
@ -149,7 +132,7 @@ includedir=%{mingw32_includedir}/%{name}

 Name: %{name}
 Description: GeoTIFF file format library
-Version: 1.7.3
+Version: %{version}
 Libs: -L\${libdir} -lgeotiff
 Cflags: -I\${includedir}
 EOF
@ -163,14 +146,13 @@ includedir=%{mingw64_includedir}/%{name}

 Name: %{name}
 Description: GeoTIFF file format library
-Version: 1.7.3
+Version: %{version}
 Libs: -L\${libdir} -lgeotiff
 Cflags: -I\${includedir}
 EOF


 %mingw_debug_install_post
-%endif


 %check
@ -193,7 +175,6 @@ EOF
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/cmake/GeoTIFF/

-%if %{with mingw}
 %files -n mingw32-%{name}
 %doc ChangeLog README
 %license COPYING
@ -219,49 +200,9 @@ EOF

 %files -n mingw64-%{name}-tools
 %{mingw64_bindir}/*.exe
-%endif


 %changelog
-* 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
-
-* Fri Jun 10 2022 Orion Poplawski <orion@nwra.com> - 1.7.1-3
- Make mingw build conditional, disable for EL9
-
 * Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 1.7.1-2
 - Rebuild with mingw-gcc-12

--- a/libgeotiff_cmake.patch
+++ b/libgeotiff_cmake.patch
@ -1,6 +1,6 @@
-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
+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,23 +17,23 @@ diff -rupN libgeotiff-1.7.3/cmake/CMakeLists.txt libgeotiff-1.7.3-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.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
+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
-    AUTHORS ChangeLog COPYING LICENSE README README_BIN README.WIN
-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-    AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
+-    DESTINATION doc)
 +#INSTALL(FILES
-+    # AUTHORS ChangeLog COPYING LICENSE README README_BIN README.WIN
-+    # DESTINATION ${CMAKE_INSTALL_DOCDIR})
+    #AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
+    #DESTINATION doc)
 
 # Install man pages
- INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-@@ -312,6 +312,9 @@ endif()
+ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
+@@ -329,6 +329,9 @@ endif()
 
 SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
    OUTPUT_NAME ${GEOTIFF_LIB_NAME})
@ -41,5 +41,5 @@ diff -rupN libgeotiff-1.7.3/CMakeLists.txt libgeotiff-1.7.3-new/CMakeLists.txt
 +    SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES SUFFIX "-${LINK_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 +ENDIF(MINGW)
 
- set(CONFIG_PUBLIC_DEPENDENCIES "")
- set(CONFIG_PRIVATE_DEPENDENCIES "")
+ set(CONFIG_DEPENDENCIES "")
+ if(TARGET TIFF::TIFF)
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (libgeotiff-1.7.3.tar.gz) = a523d6117c7433fe37b7c0cdcba81698426cd4b084bcb35c7dacc9e87bfda1ab7a4c16a9aa64a69dedb78edc2f85e8032bf8b158411f50909603e04d13821cd3
+SHA512 (libgeotiff-1.7.1.tar.gz) = af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1