diff --git a/.gitignore b/.gitignore index 59fd138..fa5c39f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,14 @@ /alembic-1.7.15.tar.gz /alembic-1.7.16.tar.gz /alembic-1.8.0_beta2.tar.gz +/alembic-1.8.0.tar.gz +/alembic-1.8.1.tar.gz +/alembic-1.8.2.tar.gz +/alembic-1.8.3.tar.gz +/alembic-1.8.4.tar.gz +/alembic-1.8.5.tar.gz +/alembic-1.8.6.tar.gz +/alembic-1.8.7.tar.gz +/alembic-1.8.8.tar.gz +/alembic-1.8.9.tar.gz +/alembic-1.8.10.tar.gz diff --git a/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch b/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch deleted file mode 100644 index c561e26..0000000 --- a/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 60bbcde225f3c28a36d8643c451509d9deb09222 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Sat, 15 Jun 2019 13:34:09 +0200 -Subject: [PATCH 2/5] Find IlmBase by setting a proper ILMBASE_ROOT value and - by using pkg-config to determine the installed ilmbase version, instead of - using the cmake STRINGS command. - -Signed-off-by: Bernd Waibel ---- - cmake/Modules/FindIlmBase.cmake | 18 +++++++++++++++++- - cmake/Modules/FindPyIlmBase.cmake | 2 +- - 2 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake -index 679a02f..0fe2b1a 100644 ---- a/cmake/Modules/FindIlmBase.cmake -+++ b/cmake/Modules/FindIlmBase.cmake -@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT) - SET( ALEMBIC_ILMBASE_ROOT NOTFOUND ) - ELSE() - # TODO: set to default install path when shipping out -- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" ) -+ SET( ALEMBIC_ILMBASE_ROOT "/usr" ) - ENDIF() - ELSE() - IF ( ${WINDOWS} ) -@@ -87,6 +87,21 @@ SET(_ilmbase_SEARCH_DIRS - /usr/freeware - ) - -+# use pkg-config to determine the correct version -+include(FindPkgConfig) -+IF(PKG_CONFIG_FOUND) -+ PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase) -+ IF(PC_ILMBASE_FOUND) -+ SET(ILMBASE_VERSION ${PC_ILMBASE_VERSION}) -+ SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${PC_ILMBASE_INCLUDE_DIRS}) -+ STRING(REGEX MATCH "-lHalf" ALEMBIC_ILMBASE_HALF_LIB ${PC_ILMBASE_LDFLAGS}) -+ STRING(REGEX MATCH "-lIex" ALEMBIC_ILMBASE_IEX_LIB ${PC_ILMBASE_LDFLAGS}) -+ STRING(REGEX MATCH "-lIexMath" ALEMBIC_ILMBASE_IEXMATH_LIB ${PC_ILMBASE_LDFLAGS}) -+ STRING(REGEX MATCH "-lIlmThread" ALEMBIC_ILMBASE_ILMTHREAD_LIB ${PC_ILMBASE_LDFLAGS}) -+ String(REGEX MATCH "-lImath" ALEMBIC_ILMBASE_IMATH_LIB ${PC_ILMBASE_LDFLAGS}) -+ ENDIF() -+ELSE(PKG_CONFIG_FOUND) -+ - FIND_PATH(ILMBASE_INCLUDE_DIR - NAMES - IlmBaseConfig.h -@@ -179,6 +194,7 @@ IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRE - MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" ) - ENDIF() - -+ENDIF(PKG_CONFIG_FOUND) - - MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" ) - MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" ) -diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake -index d55f8d3..b5f3cb5 100644 ---- a/cmake/Modules/FindPyIlmBase.cmake -+++ b/cmake/Modules/FindPyIlmBase.cmake -@@ -44,7 +44,7 @@ ELSE() - SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND) - ELSE() - # TODO: set to default install path when shipping out -- SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/") -+ SET(ALEMBIC_PYILMBASE_ROOT "/usr") - ENDIF() - ELSE() - IF (${WINDOWS}) --- -2.22.0 - diff --git a/alembic.spec b/alembic.spec index 93ae6dd..4f9b621 100644 --- a/alembic.spec +++ b/alembic.spec @@ -1,29 +1,22 @@ # Force out of source build %undefine __cmake_in_source_build -%global prerelease _beta2 +#%%global prerelease _beta2 # TODO: # Python Module Name: alembic -Version: 1.8.0 -Release: %{?prerelease:0.}1%{?prerelease}%{?dist} +Version: 1.8.10 +Release: %autorelease Summary: Open framework for storing and sharing scene data -License: BSD +License: BSD-3-Clause AND BSL-1.0 URL: http://alembic.io/ - Source0: https://github.com/%{name}/%{name}/archive/%{version}%{?prerelease}.tar.gz#/%{name}-%{version}%{?prerelease}.tar.gz -# Use patch from Gentoo fixing iblmbase root path -# https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch?id=953b3b21db55df987dd8006dcdec19e945294d98 -Patch0: alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.13 -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: hdf5-devel - -# Per https://github.com/alembic/alembic/blob/master/README.txt -# alembic actually needs ilmbase, not OpenEXR. -BuildRequires: pkgconfig(IlmBase) +BuildRequires: cmake(Imath) BuildRequires: pkgconfig(zlib) %description @@ -45,8 +38,9 @@ rendered image data. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: cmake%{?_isa} +Requires: imath-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for developing @@ -66,6 +60,7 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" %cmake %{?_cmake_skip_rpath} \ -DALEMBIC_LIB_INSTALL_DIR=%{_libdir} \ -DALEMBIC_SHARED_LIBS=ON \ + -DCMAKE_CXX_STANDARD=17 \ -DUSE_BINARIES=ON \ -DUSE_HDF5=ON \ -DUSE_EXAMPLES=ON \ @@ -99,105 +94,4 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" %{_libdir}/libAlembic.so %changelog -* Wed Apr 7 2021 Luya Tshimbalanga - 1.8.0-0.1_beta2 -- Update to 1.8.0_beta2 -- Resolves: #1946083 - -* Mon Jan 25 2021 Fedora Release Engineering - 1.7.16-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Jan 24 2021 Luya Tshimbalanga - 1.7.16-3 -- Rebuild for hdf5 and libImath - -* Fri Jan 01 2021 Richard Shaw - 1.7.16-2 -- Rebuild for OpenEXR 2.5.3. - -* Mon Oct 26 2020 Luya Tshimbalanga - 1.7.16-1 -- Update to 1.7.16 (#1856031) - -* Sun Sep 13 2020 Luya Tshimbalanga - 1.7.15-1 -- Update to 1.7.15 (#1856031) - -* Fri Jul 31 2020 Fedora Release Engineering - 1.7.13-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.7.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Luya Tshimbalanga - 1.7.13-1 -- Update to 1.7.13 (#1856031) - -* Thu Jun 25 2020 Orion Poplawski - 1.7.12-3 -- Rebuild for hdf5 1.10.6 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.7.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Oct 26 2019 Luya Tshimbalanga - 1.7.12-1 -- Update to 1.7.12 -- Patch from Gentoo addressing ilbmbase root detection -- Drop ldconfig scriptlets - -* Wed Jul 24 2019 Fedora Release Engineering - 1.7.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat May 18 2019 Luya Tshimbalanga - 1.7.11-1 -- Update to 1.7.11 - -* Thu Apr 11 2019 Richard Shaw - 1.7.8-4 -- Rebuild for Ilmbase 2.3.0. - -* Sat Mar 16 2019 Orion Poplawski - 1.7.8-3 -- Rebuild for hdf5 1.10.5 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.7.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 17 2018 Simone Caronni - 1.7.8-1 -- Update to 1.7.8. - -* Thu Jul 12 2018 Fedora Release Engineering - 1.7.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 27 2018 Luya Tshimbalanga - 1.7.7-1 -- Update to 1.7.7 - -* Sat Mar 24 2018 Luya Tshimbalanga - 1.7.6-1 -- Update to 1.7.6 - -* Sun Mar 04 2018 Luya Tshimbalanga - 1.7.5-3 -- Added gcc-c++ dependency for BuildRequires - -* Wed Feb 07 2018 Fedora Release Engineering - 1.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 25 2017 Luya Tshimbalanga - 1.7.5-1 -- Update to 1.7.5. - -* Sat Oct 28 2017 Luya Tshimbalanga - 1.7.4-1 -- Update to 1.7.4. - -* Mon Sep 11 2017 Simone Caronni - 1.7.3-1 -- Update to 1.7.3. - -* Sun Aug 06 2017 Björn Esser - 1.7.2-4 -- Rebuilt for AutoReq cmake-filesystem - -* Wed Aug 02 2017 Fedora Release Engineering - 1.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jul 23 2017 Simone Caronni - 1.7.2-1 -- Update to 1.7.2. - -* Tue May 09 2017 Simone Caronni - 1.7.1-3 -- Link to hdf5 libraries, fixes undefined references on some architectures. - -* Sat May 06 2017 Simone Caronni - 1.7.1-2 -- Review fixes. - -* Mon Apr 24 2017 Simone Caronni - 1.7.1-1 -- First build. +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..a1518a4 --- /dev/null +++ b/changelog @@ -0,0 +1,23 @@ +* Wed Jul 20 2022 Fedora Release Engineering 1.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering 1.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Nov 21 2021 Orion Poplawski 1.8.3-2 +- Rebuild for hdf5 1.12.1 + +* Sun Sep 12 2021 Luya Tshimbalanga 1.8.3-1 +- Update to 1.8.3 + +* Sat Aug 21 2021 Richard Shaw 1.8.2-6 +- Rebuild for OpenEXR/Imath 3.1. + +* Tue Aug 10 2021 Orion Poplawski 1.8.2-5 +- Rebuild for hdf5 1.10.7 + +* Wed Jul 21 2021 Fedora Release Engineering 1.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering 1.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 3dc0605..c42304e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alembic-1.8.0_beta2.tar.gz) = dc38a858f3587dc72fc34196e38421d00778dfe553618f00fe811c5316d15e85220edf64103ff49b1ab692339387276096872fb6789d185b652f67fb892c1e11 +SHA512 (alembic-1.8.10.tar.gz) = 0be292e9d75560891d38129eb2672c55475b29b33f265dd51396dfa7b530c92ac6dfdb05a4432ad1b6919e2c151068560eb04efb8d9b0c2a14f77ab489d3542c