diff --git a/.gitignore b/.gitignore index 563c92f..2948295 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -aces_container-*.tar.gz +/v1.0.tar.gz diff --git a/Aces_container-fixup.patch b/Aces_container-fixup.patch new file mode 100644 index 0000000..e33f77a --- /dev/null +++ b/Aces_container-fixup.patch @@ -0,0 +1,73 @@ +diff -up aces_container-1.0/CMakeLists.txt.fixup aces_container-1.0/CMakeLists.txt +--- aces_container-1.0/CMakeLists.txt.fixup 2013-07-27 01:07:55.000000000 +0200 ++++ aces_container-1.0/CMakeLists.txt 2014-07-29 16:14:03.818875063 +0200 +@@ -58,7 +58,7 @@ set( INSTALL_INCLUDE_DIR include CACHE P + if( WIN32 AND NOT CYGWIN ) + set(DEF_INSTALL_CMAKE_DIR CMake) + else() +- set(DEF_INSTALL_CMAKE_DIR lib/CMake/AcesContainer) ++ set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/CMake/AcesContainer) + endif() + set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) + +@@ -82,7 +82,13 @@ add_library( AcesContainer SHARED + aces_md5.cc + ) + +-install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${INSTALL_LIB_DIR}) ++# Set the build version (VERSION) and the API version (SOVERSION) ++SET_TARGET_PROPERTIES(AcesContainer ++ PROPERTIES ++ VERSION ${AcesContainer_VERSION} ++ SOVERSION ${AcesContainer_MAJOR_VERSION}) ++ ++install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${LIB_INSTALL_DIR}) + install (FILES + aces_errors.h + aces_genericWriter.h +@@ -97,14 +103,14 @@ install (FILES + aces_types.h + aces_writeattributes.h + DESTINATION +- ${INSTALL_INCLUDE_DIR}/aces ++ ${INCLUDE_INSTALL_DIR}/aces + ) + + + find_package( PkgConfig ) + if ( PKG_CONFIG_FOUND ) + configure_file(config/AcesContainer.pc.in "${PROJECT_BINARY_DIR}/AcesContainer.pc" @ONLY) +-install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib/pkgconfig COMPONENT dev ) ++install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT dev ) + endif() + + include_directories( +diff -up aces_container-1.0/config/AcesContainerConfig.cmake.in.fixup aces_container-1.0/config/AcesContainerConfig.cmake.in +--- aces_container-1.0/config/AcesContainerConfig.cmake.in.fixup 2013-07-27 01:07:55.000000000 +0200 ++++ aces_container-1.0/config/AcesContainerConfig.cmake.in 2014-07-29 16:17:38.264924248 +0200 +@@ -53,10 +53,10 @@ + # find paths + get_filename_component( AcesContainer_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH ) + +-set(AcesContainer_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") ++set(AcesContainer_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@/aces") + + set(AcesContainer_LIBRARIES AcesContainer ) +-set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" ) ++set(AcesContainer_LIBRARY_DIRS "@LIB_INSTALL_DIR@" ) + set(AcesContainer_VERSION "@AcesContainer_VERSION@" ) + + set(AcesContainer_FOUND 1 ) +diff -up aces_container-1.0/config/AcesContainerConfigVersion.cmake.in.fixup aces_container-1.0/config/AcesContainerConfigVersion.cmake.in +diff -up aces_container-1.0/config/AcesContainer.pc.in.fixup aces_container-1.0/config/AcesContainer.pc.in +--- aces_container-1.0/config/AcesContainer.pc.in.fixup 2013-07-27 01:07:55.000000000 +0200 ++++ aces_container-1.0/config/AcesContainer.pc.in 2014-07-29 16:14:03.820875036 +0200 +@@ -45,7 +45,7 @@ + # A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED. + + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@INSTALL_LIB_DIR@ ++libdir=@LIB_INSTALL_DIR@ + includedir=@INSTALL_INCLUDE_DIR@ + AcesContainer_includedir=@INSTALL_INCLUDE_DIR@/aces + diff --git a/Set-the-appropriate-SONAME-for-the-library.patch b/Set-the-appropriate-SONAME-for-the-library.patch deleted file mode 100644 index 9f5f0c6..0000000 --- a/Set-the-appropriate-SONAME-for-the-library.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 96683a250492efcc7059c8c234859ce4a89910b7 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Wed, 18 Jul 2018 11:16:29 +0200 -Subject: [PATCH 2/2] Set the appropriate SONAME for the library - -Signed-off-by: Nicolas Chauvet ---- - CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5fa059..02f1631 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,12 @@ GENERATE_EXPORT_HEADER( AcesContainer - STATIC_DEFINE AcesContainer_BUILT_AS_STATIC - ) - -+# Set the build version (VERSION) and the API version (SOVERSION) -+set_target_properties(AcesContainer -+ PROPERTIES -+ VERSION ${AcesContainer_VERSION} -+ SOVERSION ${AcesContainer_MAJOR_VERSION}) -+ - install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install (FILES - aces_errors.h --- -2.17.1 - diff --git a/Switch-to-CMAKE-default-variables.patch b/Switch-to-CMAKE-default-variables.patch deleted file mode 100644 index 29f438a..0000000 --- a/Switch-to-CMAKE-default-variables.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 3d759d35c5cbc393d1848b0476fe6bccb1866ae5 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Wed, 18 Jul 2018 11:08:04 +0200 -Subject: [PATCH 1/2] Switch to CMAKE default variables - -Signed-off-by: Nicolas Chauvet ---- - CMakeLists.txt | 31 ++++++----------------------- - config/AcesContainer.pc.in | 6 +++--- - config/AcesContainerConfig.cmake.in | 4 ++-- - 3 files changed, 11 insertions(+), 30 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 314d42c..f5fa059 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,35 +48,20 @@ cmake_minimum_required (VERSION 2.6) - project (AcesContainer) - - include (GenerateExportHeader) -+include (GNUInstallDirs) - - set( AcesContainer_MAJOR_VERSION 1 ) - set( AcesContainer_MINOR_VERSION 0 ) - set( AcesContainer_PATCH_VERSION 2 ) - set( AcesContainer_VERSION ${AcesContainer_MAJOR_VERSION}.${AcesContainer_MINOR_VERSION}.${AcesContainer_PATCH_VERSION} ) - --set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) --set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) -- -- - if(APPLE) - set( CMAKE_MACOSX_RPATH 1 ) - endif() - - if( WIN32 AND NOT CYGWIN ) -- set(DEF_INSTALL_CMAKE_DIR CMake) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0" ) --else() -- set(DEF_INSTALL_CMAKE_DIR lib/CMake/AcesContainer) - endif() --set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) -- --## convert install paths to absolute --foreach( p LIB INCLUDE CMAKE ) -- set( var INSTALL_${p}_DIR ) -- if( NOT IS_ABSOLUTE "${${var}}" ) -- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) -- endif() --endforeach() - - OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) - IF ( BUILD_SHARED_LIBS ) -@@ -103,7 +88,7 @@ GENERATE_EXPORT_HEADER( AcesContainer - STATIC_DEFINE AcesContainer_BUILT_AS_STATIC - ) - --install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${INSTALL_LIB_DIR}) -+install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install (FILES - aces_errors.h - aces_genericWriter.h -@@ -118,14 +103,14 @@ install (FILES - aces_types.h - aces_writeattributes.h - DESTINATION -- ${INSTALL_INCLUDE_DIR}/aces -+ ${CMAKE_INSTALL_INCLUDEDIR}/aces - ) - - - find_package( PkgConfig ) - if ( PKG_CONFIG_FOUND ) - configure_file(config/AcesContainer.pc.in "${PROJECT_BINARY_DIR}/AcesContainer.pc" @ONLY) --install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib/pkgconfig COMPONENT dev ) -+install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) - endif() - - include_directories( -@@ -143,10 +128,6 @@ export(TARGETS AcesContainer - export(PACKAGE AcesContainer) - # export(PACKAGE AcesContainer_lib) - --# Create the FooBarConfig.cmake and FooBarConfigVersion files --file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" -- "${INSTALL_INCLUDE_DIR}") -- - # ... for the build tree - set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}") - set(CONF_LIB_DIRS "${PROJECT_BINARY_DIR}") -@@ -166,10 +147,10 @@ configure_file(config/AcesContainerConfigVersion.cmake.in - install(FILES - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AcesContainerConfig.cmake" - "${PROJECT_BINARY_DIR}/AcesContainerConfigVersion.cmake" -- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev) - - # Install the export set for use with the install-tree - install(EXPORT AcesContainerTargets DESTINATION -- "${INSTALL_CMAKE_DIR}" COMPONENT dev) -+ "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev) - - -diff --git a/config/AcesContainer.pc.in b/config/AcesContainer.pc.in -index 838a1d9..a186346 100644 ---- a/config/AcesContainer.pc.in -+++ b/config/AcesContainer.pc.in -@@ -45,9 +45,9 @@ - # A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED. - - prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INCLUDE_DIR@ --AcesContainer_includedir=@INSTALL_INCLUDE_DIR@/aces -+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_PREFIX@@CMAKE_INSTALL_INCLUDEDIR@ -+AcesContainer_includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces - - Name: AcesContainer - Description: A library containing an implementation of ACES Image Container File -diff --git a/config/AcesContainerConfig.cmake.in b/config/AcesContainerConfig.cmake.in -index f5e6392..c35e145 100644 ---- a/config/AcesContainerConfig.cmake.in -+++ b/config/AcesContainerConfig.cmake.in -@@ -53,10 +53,10 @@ - # find paths - get_filename_component( AcesContainer_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH ) - --set(AcesContainer_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") -+set(AcesContainer_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces") - - set(AcesContainer_LIBRARIES AcesContainer ) --set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" ) -+set(AcesContainer_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" ) - set(AcesContainer_VERSION "@AcesContainer_VERSION@" ) - - set(AcesContainer_FOUND 1 ) --- -2.17.1 - diff --git a/aces_container.spec b/aces_container.spec index 7389f50..532c93a 100644 --- a/aces_container.spec +++ b/aces_container.spec @@ -1,20 +1,13 @@ -# Force out of source build -%undefine __cmake_in_source_build - Name: aces_container -Version: 1.0.2 -Release: 21%{?dist} +Version: 1.0 +Release: 10%{?dist} Summary: ACES Container Reference -# Automatically converted from old format: AMPAS BSD - review is highly recommended. -License: AMPAS +License: AMPAS BSD URL: https://github.com/ampas/aces_container -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: Switch-to-CMAKE-default-variables.patch -Patch1: Set-the-appropriate-SONAME-for-the-library.patch +Source0: https://github.com/ampas/aces_container/archive/v%{version}.tar.gz +Patch0: Aces_container-fixup.patch -BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: cmake %description @@ -33,7 +26,7 @@ not demonstrated by this reference implementation. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake-filesystem +Requires: cmake %description devel The %{name}-devel package contains libraries and header files for @@ -42,105 +35,46 @@ developing applications that use %{name}. %prep -%autosetup -p1 -chmod -x aces_writeattributes.* +%setup -q +%patch0 -p1 -b .fixup %build -%cmake +mkdir build ; cd build +%{cmake} \ + .. -%cmake_build +make %{?_smp_mflags} %install -%cmake_install +cd build +%make_install -%ldconfig_scriptlets +# remote noinstall style cmake file +rm %{buildroot}/%{_libdir}/CMake/AcesContainer/AcesContainerTargets-noconfig.cmake + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files -%doc README.md -%license LICENSE +%doc README.md LICENSE %{_libdir}/libAcesContainer.so.* %files devel %dir %{_includedir}/aces/ %{_includedir}/aces/*.h -%dir %{_libdir}/cmake/AcesContainer -%{_libdir}/cmake/AcesContainer/*.cmake +%dir %{_libdir}/CMake/AcesContainer +%{_libdir}/CMake/AcesContainer/*.cmake %{_libdir}/libAcesContainer.so %{_libdir}/pkgconfig/AcesContainer.pc %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.0.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.0.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.0.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 07 2024 Miroslav Suchý - 1.0.2-18 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1.0.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.0.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.0.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.0.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 1.0.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 1.0.2-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.0.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jul 18 2018 Nicolas Chauvet - 1.0.2-3 -- Bump patch - -* Wed Jul 18 2018 Nicolas Chauvet - 1.0.2-2 -- Update patches - -* Tue Jul 17 2018 Nicolas Chauvet - 1.0.2-1 -- Update to 1.0.2 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Wed Feb 07 2018 Fedora Release Engineering - 1.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 896420b..e145720 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aces_container-1.0.2.tar.gz) = 1a2baa66a2de8ba9f0045228efc2edae27ad3efd0f65e5acab661478a8ce9445bcb44502895ce9e6f5e6cac660a958a1d027073cffe17be897bca37e6c6a2121 +49f967ef6ecf1ed1162c22b4312f4103 v1.0.tar.gz