From e86a47df7fba70f2995e42e7c5f8fa08ca36dd38 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Apr 2025 00:36:34 +0200 Subject: [PATCH 1/4] Rebuild against correct crt --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 8d67ff6..21ad182 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Apr 17 2025 Sandro Mani - 5.2.2-7 +- Rebuild against correct crt + * Tue Apr 15 2025 Sandro Mani - 5.2.2-6 - Add proposed patch for CVE-2025-31334 From f73f39798eaf4f0befc9430a6195d951735c5e5a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Jul 2025 22:38:42 +0200 Subject: [PATCH 2/4] Increase minimum cmake version to 3.5 --- CMakeLists.txt | 2 +- giflib.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92151d4..be7873a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.0) +cmake_minimum_required(VERSION 3.5) project(giflib C) diff --git a/giflib.spec b/giflib.spec index 8d67ff6..a099f47 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jul 16 2025 Sandro Mani - 5.2.2-7 +- Increase minimum cmake version to 3.5 + * Tue Apr 15 2025 Sandro Mani - 5.2.2-6 - Add proposed patch for CVE-2025-31334 From 421662abf7416cbb73cb440112e58b4316b31789 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Jul 2025 23:00:28 +0200 Subject: [PATCH 3/4] Use GNUInstallDirs --- CMakeLists.txt | 15 ++++++++------- giflib.spec | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be7873a..5bd836c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.5) project(giflib C) +include(GNUInstallDirs) SET(BUILD_STATIC_LIBS OFF CACHE BOOL "Whether to also build static libs") @@ -77,21 +78,21 @@ endforeach() ### Installation install(TARGETS gif - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) if(${BUILD_STATIC_LIBS}) - install(TARGETS gif_static ARCHIVE DESTINATION lib${LIB_SUFFIX}) + install(TARGETS gif_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif(${BUILD_STATIC_LIBS}) foreach(UTILITY ${giflib_UTILS}) - install(TARGETS ${UTILITY} DESTINATION bin) + install(TARGETS ${UTILITY} DESTINATION ${CMAKE_INSTALL_BINDIR}) endforeach() -install(FILES gif_lib.h gif_getarg.h DESTINATION include) -install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) +install(FILES gif_lib.h gif_getarg.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) ### Distribution tarball diff --git a/giflib.spec b/giflib.spec index a099f47..5283ed3 100644 --- a/giflib.spec +++ b/giflib.spec @@ -154,6 +154,7 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog * Wed Jul 16 2025 Sandro Mani - 5.2.2-7 - Increase minimum cmake version to 3.5 +- Use GnuInstallDirs * Tue Apr 15 2025 Sandro Mani - 5.2.2-6 - Add proposed patch for CVE-2025-31334 From 23eb07266efa36fb051a62b6b092fcf877025f2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:20:22 +0000 Subject: [PATCH 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- giflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giflib.spec b/giflib.spec index 5283ed3..682379f 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.2 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -152,6 +152,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 5.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Sandro Mani - 5.2.2-7 - Increase minimum cmake version to 3.5 - Use GnuInstallDirs