diff --git a/.gitignore b/.gitignore index 7de9efa..fe111d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/libgeotiff-1.5.1.tar.gz -/libgeotiff-1.6.0.tar.gz -/libgeotiff-1.7.0.tar.gz -/libgeotiff-1.7.1.tar.gz +SOURCES/libgeotiff-1.7.3.tar.gz diff --git a/.libgeotiff.metadata b/.libgeotiff.metadata new file mode 100644 index 0000000..9da21ab --- /dev/null +++ b/.libgeotiff.metadata @@ -0,0 +1 @@ +8bb14997d43ff78f5a39b803a0e3aa7425e71b8e SOURCES/libgeotiff-1.7.3.tar.gz diff --git a/SOURCES/libgeotiff_cmake.patch b/SOURCES/libgeotiff_cmake.patch new file mode 100644 index 0000000..be5a80b --- /dev/null +++ b/SOURCES/libgeotiff_cmake.patch @@ -0,0 +1,45 @@ +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 + # be relocated.) +-if (NOT WIN32) +- set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") +- set (PROJECT_ROOT_DIR "../../..") +-else () +- set (INSTALL_CMAKE_DIR "cmake") +- set (PROJECT_ROOT_DIR "..") +-endif () ++set (INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") ++set (PROJECT_ROOT_DIR "../../..") + + 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 + + # Install doc files +-INSTALL(FILES +- 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 ${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_PUBLIC_DEPENDENCIES "") + set(CONFIG_PRIVATE_DEPENDENCIES "") diff --git a/libgeotiff.spec b/SPECS/libgeotiff.spec similarity index 86% rename from libgeotiff.spec rename to SPECS/libgeotiff.spec index b58afe9..b9ce311 100644 --- a/libgeotiff.spec +++ b/SPECS/libgeotiff.spec @@ -5,7 +5,7 @@ %endif Name: libgeotiff -Version: 1.7.1 +Version: 1.7.3 Release: 3%{?dist} Summary: GeoTIFF format library @@ -28,14 +28,14 @@ BuildRequires: zlib-devel %if %{with mingw} BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw32-gcc +BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-libtiff BuildRequires: mingw32-libjpeg BuildRequires: mingw32-proj BuildRequires: mingw32-zlib BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw64-gcc +BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-libtiff BuildRequires: mingw64-libjpeg BuildRequires: mingw64-proj @@ -105,12 +105,14 @@ BuildArch: noarch %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 %if %{with mingw} # MinGW build -%mingw_cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name} +MINGW32_CMAKE_ARGS=-DCMAKE_INSTALL_INCLUDEDIR=%{mingw32_includedir}/%{name} \ +MINGW64_CMAKE_ARGS=-DCMAKE_INSTALL_INCLUDEDIR=%{mingw64_includedir}/%{name} \ +%mingw_cmake %mingw_make_build %endif @@ -132,7 +134,7 @@ includedir=%{_includedir}/%{name} Name: %{name} Description: GeoTIFF file format library -Version: %{version} +Version: 1.7.3 Libs: -L\${libdir} -lgeotiff Cflags: -I\${includedir} EOF @@ -147,7 +149,7 @@ includedir=%{mingw32_includedir}/%{name} Name: %{name} Description: GeoTIFF file format library -Version: %{version} +Version: 1.7.3 Libs: -L\${libdir} -lgeotiff Cflags: -I\${includedir} EOF @@ -161,7 +163,7 @@ includedir=%{mingw64_includedir}/%{name} Name: %{name} Description: GeoTIFF file format library -Version: %{version} +Version: 1.7.3 Libs: -L\${libdir} -lgeotiff Cflags: -I\${includedir} EOF @@ -221,6 +223,48 @@ EOF %changelog +* Sat Dec 28 2024 Arkady L. Shane - 1.7.3-3 +- Rebuilt for MSVSphere 10 + +* Tue Sep 17 2024 Sandro Mani - 1.7.3-3 +- Rebuild (proj) + +* Thu Jul 18 2024 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat May 25 2024 Sandro Mani - 1.7.3-1 +- Update to 1.7.3 + +* Tue Mar 05 2024 Sandro Mani - 1.7.1-13 +- Rebuild (proj) + +* Thu Jan 25 2024 Fedora Release Engineering - 1.7.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.7.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Sep 03 2023 Sandro Mani - 1.7.1-10 +- Rebuild (proj) + +* Thu Jul 20 2023 Fedora Release Engineering - 1.7.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu May 18 2023 Orion Poplawski - 1.7.1-8 +- Change BR to mingw*-gcc-c++ + +* Sat Mar 04 2023 Sandro Mani - 1.7.1-7 +- Rebuild (proj) + +* Thu Jan 19 2023 Fedora Release Engineering - 1.7.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Sep 04 2022 Sandro Mani - 1.7.1-5 +- Rebuild (proj) + +* Thu Jul 21 2022 Fedora Release Engineering - 1.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jun 10 2022 Orion Poplawski - 1.7.1-3 - Make mingw build conditional, disable for EL9 diff --git a/libgeotiff_cmake.patch b/libgeotiff_cmake.patch deleted file mode 100644 index 54464b8..0000000 --- a/libgeotiff_cmake.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - # be relocated.) --if (NOT WIN32) -- set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") -- set (PROJECT_ROOT_DIR "../../..") --else () -- set (INSTALL_CMAKE_DIR "cmake") -- set (PROJECT_ROOT_DIR "..") --endif () -+set (INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") -+set (PROJECT_ROOT_DIR "../../..") - - 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}) - - # 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) - - # Install man pages - 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}) -+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) diff --git a/sources b/sources deleted file mode 100644 index 5df24e6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libgeotiff-1.7.1.tar.gz) = af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1