CMakeLists.txt

@@ -1,6 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.8)
 project(jxrlib C)
-include(GNUInstallDirs)
 
 set(JXRLIB_MAJOR 0)
 set(JXRLIB_MINOR 0)
@@ -31,9 +30,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 ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib${LIB_SUFFIX}
+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 )
 
 # JXR-GLUE Library
@@ -45,25 +44,25 @@ set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION
 target_link_libraries(jxrglue jpegxr m)
 
 install(TARGETS jxrglue
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib${LIB_SUFFIX}
+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 )
 
 # JxrEncApp Executable
 add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c)
 target_link_libraries(JxrEncApp jxrglue)
-install(TARGETS JxrEncApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS JxrEncApp RUNTIME DESTINATION bin)
 
 # JxrDecApp Executable
 add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c)
 target_link_libraries(JxrDecApp jxrglue)
-install(TARGETS JxrDecApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS JxrDecApp RUNTIME DESTINATION bin)
 
 # Headers
 install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jxrlib
+  DESTINATION include/jxrlib
 )
-install(DIRECTORY common/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jxrlib
+install(DIRECTORY common/include/ DESTINATION include/jxrlib
   FILES_MATCHING PATTERN "*.h"
 )

jxrlib.spec

@@ -1,12 +1,11 @@
 Name:           jxrlib
 Version:        1.1
-Release:        32%{?dist}
+Release:        24%{?dist}
 Summary:        Open source implementation of jpegxr
 
 # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at
 # https://jxrlib.codeplex.com/workitem/13
-# Automatically converted from old format: BSD - review is highly recommended.
-License:        LicenseRef-Callaway-BSD
+License:        BSD
 URL:            https://jxrlib.codeplex.com/
 Source0:        http://jxrlib.codeplex.com/downloads/get/685249#/jxrlib_%(echo %{version} | tr . _).tar.gz
 # Use CMake to build to facilitate creation of shared libraries
@@ -21,6 +20,8 @@ Source2:        JPEGXR_DPK_Spec_1.0.pdf
 Patch0:         jxrlib_warnings.patch
 # Mingw build fixes
 Patch1:         jxrlib_mingw.patch
+# Fix undefined uintptr_t
+Patch2:         jxrlib_stdint.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -74,8 +75,9 @@ for file in `find . -type f -name '*.c' -or -name '*.h' -or -name '*.txt'`; do
   touch -r $file $file.new && mv $file.new $file
 done
 
-%patch -P0 -p1
-%patch -P1 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 # Remove shipped binaries
 rm -rf bin
@@ -138,31 +140,6 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h
 
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jul 16 2025 Sandro Mani <manisandro@gmail.com> - 1.1-31
-- Increase minimum cmake version to 3.5
-- Port CMakeLists.txt to GNUInstallDirs
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1-29
-- convert license to SPDX
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild