Rebuild against correct crt

2025-04-18 00:36:34 +02:00
2 changed files with 11 additions and 16 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,7 +1,6 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6.0)

 project(giflib C)
-include(GNUInstallDirs)

 SET(BUILD_STATIC_LIBS OFF CACHE BOOL "Whether to also build static libs")

@ -78,21 +77,21 @@ endforeach()
 ### Installation

 install(TARGETS gif
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
 )

 if(${BUILD_STATIC_LIBS})
-    install(TARGETS gif_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(TARGETS gif_static ARCHIVE DESTINATION lib${LIB_SUFFIX})
 endif(${BUILD_STATIC_LIBS})

 foreach(UTILITY ${giflib_UTILS})
-    install(TARGETS ${UTILITY} DESTINATION ${CMAKE_INSTALL_BINDIR})
+    install(TARGETS ${UTILITY} DESTINATION bin)
 endforeach()

-install(FILES gif_lib.h gif_getarg.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+install(FILES gif_lib.h gif_getarg.h DESTINATION include)
+install(FILES ${giflib_MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)


 ### Distribution tarball
--- 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:       8%{?dist}
+Release:       7%{?dist}

 License:       MIT
 URL:           http://www.sourceforge.net/projects/%{name}/
@ -152,12 +152,8 @@ rm -rf %{buildroot}%{mingw64_mandir}


 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jul 16 2025 Sandro Mani <manisandro@gmail.com> - 5.2.2-7
- Increase minimum cmake version to 3.5
- Use GnuInstallDirs
+* Thu Apr 17 2025 Sandro Mani <manisandro@gmail.com> - 5.2.2-7
+- Rebuild against correct crt

 * Tue Apr 15 2025 Sandro Mani <manisandro@gmail.com> - 5.2.2-6
 - Add proposed patch for CVE-2025-31334