From 03ea84bb9a3b01933144e06874aa76601d4c3a9d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Jul 2025 23:38:35 +0200 Subject: [PATCH 1/2] Increase minimum cmake version to 3.5, use GNUInstallDirs --- CMakeLists.txt | 23 ++++++++++++----------- jxrlib.spec | 6 +++++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 406da98..ed58ca8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(jxrlib C) +include(GNUInstallDirs) set(JXRLIB_MAJOR 0) set(JXRLIB_MINOR 0) @@ -30,9 +31,9 @@ add_library(jpegxr ${jpegxr_SRC} ${jpegxr_HDR}) set_target_properties(jpegxr PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION}) install(TARGETS jpegxr - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # JXR-GLUE Library @@ -44,25 +45,25 @@ set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION target_link_libraries(jxrglue jpegxr m) install(TARGETS jxrglue - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # JxrEncApp Executable add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c) target_link_libraries(JxrEncApp jxrglue) -install(TARGETS JxrEncApp RUNTIME DESTINATION bin) +install(TARGETS JxrEncApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # JxrDecApp Executable add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c) target_link_libraries(JxrDecApp jxrglue) -install(TARGETS JxrDecApp RUNTIME DESTINATION bin) +install(TARGETS JxrDecApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # Headers install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h - DESTINATION include/jxrlib + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jxrlib ) -install(DIRECTORY common/include/ DESTINATION include/jxrlib +install(DIRECTORY common/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jxrlib FILES_MATCHING PATTERN "*.h" ) diff --git a/jxrlib.spec b/jxrlib.spec index eecb697..012512d 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -138,6 +138,10 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Wed Jul 16 2025 Sandro Mani - 1.1-31 +- Increase minimum cmake version to 3.5 +- Port CMakeLists.txt to GNUInstallDirs + * Fri Jan 17 2025 Fedora Release Engineering - 1.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9fc71d170bfb8643f038b4594b0dce8146a0e21d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:09:33 +0000 Subject: [PATCH 2/2] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 012512d..85602f1 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -138,6 +138,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Sandro Mani - 1.1-31 - Increase minimum cmake version to 3.5 - Port CMakeLists.txt to GNUInstallDirs