From 1b07e572cbe3ba92dfbd0a93f53ad99d8aa32374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:09:05 +0200 Subject: [PATCH 01/66] Rebuilt for Python 3.8 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 18cbdcb..042b4f1 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 16%{?dist} +Release: 17%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -150,6 +150,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.11.1-17 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 1.11.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b663fc33b9ffc3dcd113971a0c2fc8ae7235408d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:41:16 +0200 Subject: [PATCH 02/66] Rebuilt for Python 3.8.0rc1 (#1748018) --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 042b4f1..ea7b291 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 17%{?dist} +Release: 18%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -150,6 +150,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Thu Oct 03 2019 Miro Hrončok - 1.11.1-18 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 1.11.1-17 - Rebuilt for Python 3.8 From 31f28a2a1018bbafde9cd738cb9dca197a53b82c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:08:12 +0000 Subject: [PATCH 03/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index ea7b291..d7a7848 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 18%{?dist} +Release: 19%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -150,6 +150,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.11.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 1.11.1-18 - Rebuilt for Python 3.8.0rc1 (#1748018) From 25e6738ce8fd678e0421fd94e1cf9414352ae068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:26 +0200 Subject: [PATCH 04/66] Rebuilt for Python 3.9 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index d7a7848..71c47d4 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 19%{?dist} +Release: 20%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -150,6 +150,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Tue May 26 2020 Miro Hrončok - 1.11.1-20 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 1.11.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f36ab836e3e25c17db782dc5236a097b7bef7584 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 29 May 2020 00:40:21 +0100 Subject: [PATCH 05/66] Rebuilt for Boost 1.73 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 71c47d4..ce99e57 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 20%{?dist} +Release: 21%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -150,6 +150,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Thu May 28 2020 Jonathan Wakely - 1.11.1-21 +- Rebuilt for Boost 1.73 + * Tue May 26 2020 Miro Hrončok - 1.11.1-20 - Rebuilt for Python 3.9 From 2f9e32dbc8e1a22aa3e21cc64b4bd260562894d3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Jun 2020 14:29:43 -0600 Subject: [PATCH 06/66] Rebuild for hdf5 1.10.6 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index ce99e57..865aedf 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 21%{?dist} +Release: 22%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -150,6 +150,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Thu Jun 25 2020 Orion Poplawski - 1.11.1-22 +- Rebuild for hdf5 1.10.6 + * Thu May 28 2020 Jonathan Wakely - 1.11.1-21 - Rebuilt for Boost 1.73 From 1353d08fc755432fc5d40640da651448270bf722 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Fri, 24 Jul 2020 11:18:45 +0100 Subject: [PATCH 07/66] cmake macros have changed --- vigra.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vigra.spec b/vigra.spec index 865aedf..0969078 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 22%{?dist} +Release: 23%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -87,12 +87,9 @@ sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python3}=' \ sed -i 's=SET(BOOST_PYTHON_NAMES=& boost_python%{python3_version_nodots}=' \ config/FindVIGRANUMPY_DEPENDENCIES.cmake -mkdir buildpy3 -pushd buildpy3 -%cmake .. -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \ +%cmake -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \ -DWITH_VIGRANUMPY=1 -DPYTHON_VERSION=%{python3_version} -make VERBOSE=1 %{?_smp_mflags} -popd +%cmake_build %else sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python}=' \ config/vigra-config.in @@ -111,7 +108,7 @@ find ./doc/ -type f | xargs chmod -x rm -rf %{buildroot} %if ! 0%{?rhel} -make -C buildpy3 install DESTDIR=%{buildroot} +%cmake_install mv %{buildroot}/%{_libdir}/vigranumpy/VigranumpyConfig.cmake \ %{buildroot}/%{_libdir}/vigranumpy/Vigranumpy3Config.cmake @@ -150,6 +147,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Jul 24 2020 Bruno Postle - 1.11.1-23 +- Rebuild for changed cmake macros + * Thu Jun 25 2020 Orion Poplawski - 1.11.1-22 - Rebuild for hdf5 1.10.6 From 93b533fe59d36ac9040637b03d064b213ba81a54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:41:57 +0000 Subject: [PATCH 08/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 0969078..1624c66 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 23%{?dist} +Release: 24%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -147,6 +147,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.11.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 24 2020 Bruno Postle - 1.11.1-23 - Rebuild for changed cmake macros From 60775ed699a4416f27991a04592c73a874f0d681 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 1 Jan 2021 16:23:23 -0600 Subject: [PATCH 09/66] Rebuild for OpenEXR 2.5.3. --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 1624c66..deeecfe 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 24%{?dist} +Release: 25%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -147,6 +147,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Jan 01 2021 Richard Shaw - 1.11.1-25 +- Rebuild for OpenEXR 2.5.3. + * Wed Jul 29 2020 Fedora Release Engineering - 1.11.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cda9d92c0c5c22cf9da0f04891f064071828b450 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:41:54 +0000 Subject: [PATCH 10/66] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vigra.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vigra.spec b/vigra.spec index deeecfe..0b4917e 100644 --- a/vigra.spec +++ b/vigra.spec @@ -19,6 +19,7 @@ Patch2: vigra-1.11.1.docdir.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1597394 Patch3: vigra-1.11.1.py37.patch URL: http://ukoethe.github.io/vigra/ +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: zlib-devel BuildRequires: libjpeg-devel From ae2d78441403ff0904f8e1c517513f842af000a9 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 20:53:54 +0000 Subject: [PATCH 11/66] Rebuilt for Boost 1.75 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 0b4917e..ff975a4 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 25%{?dist} +Release: 26%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -148,6 +148,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Jan 22 2021 Jonathan Wakely - 1.11.1-26 +- Rebuilt for Boost 1.75 + * Fri Jan 01 2021 Richard Shaw - 1.11.1-25 - Rebuild for OpenEXR 2.5.3. From 07d0a757bcd9e7fc92cc24699a33a4e71a83ede7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:03:06 +0000 Subject: [PATCH 12/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index ff975a4..219be0f 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 26%{?dist} +Release: 27%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -148,6 +148,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.11.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 1.11.1-26 - Rebuilt for Boost 1.75 From 2af831d4496f3762c854045b06976ba919c1ebde Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:37:19 +0100 Subject: [PATCH 13/66] Rebuilt for removed libstdc++ symbol (#1937698) --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 219be0f..1481ba4 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 27%{?dist} +Release: 28%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -148,6 +148,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Tue Mar 30 2021 Jonathan Wakely - 1.11.1-28 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Wed Jan 27 2021 Fedora Release Engineering - 1.11.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From aca3f1d29deefd5e57765f9194c58b0adad127a4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:20 +0200 Subject: [PATCH 14/66] Rebuilt for Python 3.10 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 1481ba4..093cc94 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 28%{?dist} +Release: 29%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -148,6 +148,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Jun 04 2021 Python Maint - 1.11.1-29 +- Rebuilt for Python 3.10 + * Tue Mar 30 2021 Jonathan Wakely - 1.11.1-28 - Rebuilt for removed libstdc++ symbol (#1937698) From a2eb942f350236bb66016807de65174551495858 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:27:04 +0000 Subject: [PATCH 15/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 093cc94..ce9e5de 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 29%{?dist} +Release: 30%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -148,6 +148,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.11.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.11.1-29 - Rebuilt for Python 3.10 From 50e5737ccf136f2ee3afe709849755a6c2c2e8ff Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 1 Aug 2021 19:46:00 -0500 Subject: [PATCH 16/66] Rebuild for OpenEXR/Imath 3. --- vigra.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vigra.spec b/vigra.spec index 093cc94..2d58379 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 29%{?dist} +Release: 30%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -19,7 +19,7 @@ Patch2: vigra-1.11.1.docdir.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1597394 Patch3: vigra-1.11.1.py37.patch URL: http://ukoethe.github.io/vigra/ -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -33,7 +33,12 @@ BuildRequires: doxygen Requires: python3 BuildRequires: hdf5-devel BuildRequires: python3-sphinx +%if 0%{?fedora} > 34 +BuildRequires: cmake(OpenEXR) +BuildRequires: cmake(Imath) +%else BuildRequires: OpenEXR-devel +%endif BuildRequires: python3-numpy-f2py BuildRequires: boost-python3 BuildRequires: boost-python3-devel @@ -148,6 +153,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Mon Aug 02 2021 Richard Shaw - 1.11.1-30 +- Rebuild for OpenEXR/Imath 3. + * Fri Jun 04 2021 Python Maint - 1.11.1-29 - Rebuilt for Python 3.10 From 590b2d2e8a00bc68d57afd44ca3f6bcf8db740da Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 1 Aug 2021 19:47:24 -0500 Subject: [PATCH 17/66] Bump release. --- vigra.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vigra.spec b/vigra.spec index d4e5a85..6dcef0c 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 30%{?dist} +Release: 31%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -153,7 +153,7 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog -* Mon Aug 02 2021 Richard Shaw - 1.11.1-30 +* Mon Aug 02 2021 Richard Shaw - 1.11.1-31 - Rebuild for OpenEXR/Imath 3. * Fri Jul 23 2021 Fedora Release Engineering - 1.11.1-30 From 583ed06a86f25dc6db195fb65513b2b061ce4faa Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 2 Aug 2021 21:52:18 -0500 Subject: [PATCH 18/66] Add patch to link with OpenEXR/Imath 3 properly. --- vigra-openexr3.patch | 26 ++++++++++++++++++++++++++ vigra.spec | 12 +++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 vigra-openexr3.patch diff --git a/vigra-openexr3.patch b/vigra-openexr3.patch new file mode 100644 index 0000000..8e2d5af --- /dev/null +++ b/vigra-openexr3.patch @@ -0,0 +1,26 @@ +Index: vigra-1.11.1/CMakeLists.txt +=================================================================== +--- vigra-1.11.1.orig/CMakeLists.txt ++++ vigra-1.11.1/CMakeLists.txt +@@ -107,7 +107,21 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3 + + + IF(WITH_OPENEXR) ++ FIND_PACKAGE(Imath CONFIG) ++ IF(TARGET Imath::Imath) ++ FIND_PACKAGE(OpenEXR CONFIG) ++ SET(OPENEXR_LIBRARIES ++ OpenEXR::Iex ++ OpenEXR::IlmThread ++ Imath::Imath ++ ) ++ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES) ++ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR}) ++ set(OPENEXR_FOUND TRUE) ++ ELSE() + VIGRA_FIND_PACKAGE(OpenEXR) ++ ENDIF() + ENDIF() + + IF(WITH_HDF5) diff --git a/vigra.spec b/vigra.spec index 6dcef0c..7f640ad 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 31%{?dist} +Release: 31%{?dist}.1 License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -18,6 +18,13 @@ Patch1: vigra-1.10.0-no-lenna.patch Patch2: vigra-1.11.1.docdir.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1597394 Patch3: vigra-1.11.1.py37.patch +# As of OpenEXR 3 upstream has significantly reorganized the libraries +# including splitting out imath as a standalone library (which this project may +# or may not need). Please see +# https://github.com/AcademySoftwareFoundation/Imath/blob/master/docs/PortingGuide2-3.md +# for porting details and encourage upstream to support it. +# Minimal patch provided. +Patch4: vigra-openexr3.patch URL: http://ukoethe.github.io/vigra/ BuildRequires: make BuildRequires: gcc-c++ @@ -153,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Tue Aug 03 2021 Richard Shaw - 1.11.1-31.1 +- Add patch to link with OpenEXR/Imath 3 properly. + * Mon Aug 02 2021 Richard Shaw - 1.11.1-31 - Rebuild for OpenEXR/Imath 3. From e969939d5d7270e49e1d80be6542bd6bc2692ac4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 7 Aug 2021 00:49:14 +0100 Subject: [PATCH 19/66] Rebuilt for Boost 1.76 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 7f640ad..012a124 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 31%{?dist}.1 +Release: 32%{?dist}.1 License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -160,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Aug 06 2021 Jonathan Wakely - 1.11.1-32.1 +- Rebuilt for Boost 1.76 + * Tue Aug 03 2021 Richard Shaw - 1.11.1-31.1 - Add patch to link with OpenEXR/Imath 3 properly. From 374949be238b68fb9777080fb907535750959be1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Aug 2021 20:14:59 -0600 Subject: [PATCH 20/66] Rebuild for hdf5 1.10.7 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 012a124..2da189c 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 32%{?dist}.1 +Release: 33%{?dist}.1 License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -160,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Tue Aug 10 2021 Orion Poplawski - 1.11.1-33.1 +- Rebuild for hdf5 1.10.7 + * Fri Aug 06 2021 Jonathan Wakely - 1.11.1-32.1 - Rebuilt for Boost 1.76 From a57ea10b190b248bf83d9a766fab09d47e574922 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 10 Aug 2021 14:52:33 -0500 Subject: [PATCH 21/66] Rebuild with Imath 3. --- vigra-openexr3.patch | 16 +++++++++++++++- vigra.spec | 5 ++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/vigra-openexr3.patch b/vigra-openexr3.patch index 8e2d5af..793262f 100644 --- a/vigra-openexr3.patch +++ b/vigra-openexr3.patch @@ -2,7 +2,7 @@ Index: vigra-1.11.1/CMakeLists.txt =================================================================== --- vigra-1.11.1.orig/CMakeLists.txt +++ vigra-1.11.1/CMakeLists.txt -@@ -107,7 +107,21 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3 +@@ -107,7 +107,23 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3 IF(WITH_OPENEXR) @@ -14,6 +14,8 @@ Index: vigra-1.11.1/CMakeLists.txt + OpenEXR::IlmThread + Imath::Imath + ) ++ # Temorary fix for libpthread being absorbed into libc. ++ list(REMOVE_ITEM OPENEXR_LIBRARIES "Threads::Threads") + get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR}) @@ -24,3 +26,15 @@ Index: vigra-1.11.1/CMakeLists.txt ENDIF() IF(WITH_HDF5) +Index: vigra-1.11.1/src/impex/CMakeLists.txt +=================================================================== +--- vigra-1.11.1.orig/src/impex/CMakeLists.txt ++++ vigra-1.11.1/src/impex/CMakeLists.txt +@@ -85,6 +85,7 @@ IF(TIFF_FOUND) + ENDIF(TIFF_FOUND) + + IF(OPENEXR_FOUND) ++ cmake_policy(SET CMP0028 NEW) + TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES}) + ENDIF(OPENEXR_FOUND) + diff --git a/vigra.spec b/vigra.spec index 2da189c..ed7822b 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 33%{?dist}.1 +Release: 34%{?dist}.1 License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -160,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Tue Aug 10 2021 Richard Shaw - 1.11.1-34.1 +- Rebuild with Imath 3. + * Tue Aug 10 2021 Orion Poplawski - 1.11.1-33.1 - Rebuild for hdf5 1.10.7 From 4177629f25088befabb73f9cea501b95869a0e8f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 10 Aug 2021 16:21:05 -0500 Subject: [PATCH 22/66] Fix building with OpenEXR. --- vigra-openexr3.patch | 5 ++--- vigra.spec | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/vigra-openexr3.patch b/vigra-openexr3.patch index 793262f..a4c9b76 100644 --- a/vigra-openexr3.patch +++ b/vigra-openexr3.patch @@ -2,7 +2,7 @@ Index: vigra-1.11.1/CMakeLists.txt =================================================================== --- vigra-1.11.1.orig/CMakeLists.txt +++ vigra-1.11.1/CMakeLists.txt -@@ -107,7 +107,23 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3 +@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3 IF(WITH_OPENEXR) @@ -10,12 +10,11 @@ Index: vigra-1.11.1/CMakeLists.txt + IF(TARGET Imath::Imath) + FIND_PACKAGE(OpenEXR CONFIG) + SET(OPENEXR_LIBRARIES ++ OpenEXR::OpenEXR + OpenEXR::Iex + OpenEXR::IlmThread + Imath::Imath + ) -+ # Temorary fix for libpthread being absorbed into libc. -+ list(REMOVE_ITEM OPENEXR_LIBRARIES "Threads::Threads") + get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR}) diff --git a/vigra.spec b/vigra.spec index ed7822b..2e4a61e 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 34%{?dist}.1 +Release: 35%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -160,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Tue Aug 10 2021 Richard Shaw - 1.11.1-35 +- Fix building with OpenEXR. + * Tue Aug 10 2021 Richard Shaw - 1.11.1-34.1 - Rebuild with Imath 3. From 6d4418110a1684e4a0512eda3dc9785e9120c93c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Aug 2021 07:30:09 -0600 Subject: [PATCH 23/66] Rebuild for hdf5 1.10.7 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 2e4a61e..8059e21 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 35%{?dist} +Release: 36%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -160,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Wed Aug 11 2021 Orion Poplawski - 1.11.1-36 +- Rebuild for hdf5 1.10.7 + * Tue Aug 10 2021 Richard Shaw - 1.11.1-35 - Fix building with OpenEXR. From 09f0b5c633e47b34b40ebbca935d6203fe66c1a3 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 20 Aug 2021 19:18:03 -0500 Subject: [PATCH 24/66] Rebuild for OpenEXR/Imath 3.1. --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 8059e21..d2fff12 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 36%{?dist} +Release: 37%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -160,6 +160,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Aug 21 2021 Richard Shaw - 1.11.1-37 +- Rebuild for OpenEXR/Imath 3.1. + * Wed Aug 11 2021 Orion Poplawski - 1.11.1-36 - Rebuild for hdf5 1.10.7 From a3595f10e860f55f98ff46d4cdb06f0d7e6e7052 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 20 Nov 2021 21:43:10 -0700 Subject: [PATCH 25/66] Rebuild for hdf5 1.12.1 --- vigra.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index d2fff12..5947a53 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 37%{?dist} +Release: 38%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -100,6 +100,7 @@ sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python3}=' \ sed -i 's=SET(BOOST_PYTHON_NAMES=& boost_python%{python3_version_nodots}=' \ config/FindVIGRANUMPY_DEPENDENCIES.cmake +export CXXFLAGS="%{optflags} -DH5_USE_110_API" %cmake -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \ -DWITH_VIGRANUMPY=1 -DPYTHON_VERSION=%{python3_version} %cmake_build @@ -160,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sun Nov 21 2021 Orion Poplawski - 1.11.1-38 +- Rebuild for hdf5 1.12.1 + * Sat Aug 21 2021 Richard Shaw - 1.11.1-37 - Rebuild for OpenEXR/Imath 3.1. From a3a36307665e448b18f044eab902b14664494159 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:57:15 +0000 Subject: [PATCH 26/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 5947a53..f3807f5 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 38%{?dist} +Release: 39%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -161,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.11.1-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Nov 21 2021 Orion Poplawski - 1.11.1-38 - Rebuild for hdf5 1.12.1 From b8d5d3d2010f3a72bad8ac03f39e1463d05d499f Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:30 +0200 Subject: [PATCH 27/66] Rebuilt for Boost 1.78 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index f3807f5..5aae0e9 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 39%{?dist} +Release: 40%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -161,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Wed May 04 2022 Thomas Rodgers - 1.11.1-40 +- Rebuilt for Boost 1.78 + * Sat Jan 22 2022 Fedora Release Engineering - 1.11.1-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 469858d2aae63a869100ac0022b1f8f7af5c6664 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 20:59:46 +0200 Subject: [PATCH 28/66] Rebuilt for Python 3.11 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 5aae0e9..face590 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 40%{?dist} +Release: 41%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -161,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Mon Jun 13 2022 Python Maint - 1.11.1-41 +- Rebuilt for Python 3.11 + * Wed May 04 2022 Thomas Rodgers - 1.11.1-40 - Rebuilt for Boost 1.78 From 505bc3d081ae43b333d35951d6a7184af2523332 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:51:38 +0000 Subject: [PATCH 29/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index face590..0e7e781 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 41%{?dist} +Release: 42%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -161,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.11.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.11.1-41 - Rebuilt for Python 3.11 From 690b3f9e89bc2a53be9e52c44da2ae9c14183608 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:16:38 +0000 Subject: [PATCH 30/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 0e7e781..75cbb45 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 42%{?dist} +Release: 43%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -161,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.11.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.11.1-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d27f7745c53e1fb44a121f76b9bf0374114f0115 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 22:03:47 +0000 Subject: [PATCH 31/66] Rebuilt for Boost 1.81 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 75cbb45..5463ded 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 43%{?dist} +Release: 44%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -161,6 +161,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Mon Feb 20 2023 Jonathan Wakely - 1.11.1-44 +- Rebuilt for Boost 1.81 + * Sat Jan 21 2023 Fedora Release Engineering - 1.11.1-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 70d35e14c3001da165d0fcce6b938bb65b014bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Apr 2023 12:05:56 +0200 Subject: [PATCH 32/66] BuildRequire setuptools to fix distutils error on Python 3.12 --- vigra.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vigra.spec b/vigra.spec index 5463ded..4dbb291 100644 --- a/vigra.spec +++ b/vigra.spec @@ -39,6 +39,7 @@ BuildRequires: doxygen %if ! 0%{?rhel} Requires: python3 BuildRequires: hdf5-devel +BuildRequires: python3-setuptools BuildRequires: python3-sphinx %if 0%{?fedora} > 34 BuildRequires: cmake(OpenEXR) From 21c5d7b17fab9fd2fa5a017417e77c6599a0dcb1 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sat, 29 Apr 2023 08:59:20 +0100 Subject: [PATCH 33/66] Python bindings need setuptools (Tomas Hrnciar) --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 4dbb291..0413780 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 44%{?dist} +Release: 45%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -162,6 +162,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Apr 29 2023 Bruno Postle - 1.11.1-45 +- Python bindings need setuptools (Tomas Hrnciar) + * Mon Feb 20 2023 Jonathan Wakely - 1.11.1-44 - Rebuilt for Boost 1.81 From 1006566cf91c988743cb4823b9fa696500ffc7a6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 3 Jul 2023 13:58:11 +0200 Subject: [PATCH 34/66] Rebuilt for Python 3.12 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 0413780..3a85c4b 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 45%{?dist} +Release: 46%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -162,6 +162,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Mon Jul 03 2023 Python Maint - 1.11.1-46 +- Rebuilt for Python 3.12 + * Sat Apr 29 2023 Bruno Postle - 1.11.1-45 - Python bindings need setuptools (Tomas Hrnciar) From 8be89cf180f44c2b317bebf9e36287a60ce0d87d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:37:00 +0000 Subject: [PATCH 35/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 3a85c4b..1691063 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 46%{?dist} +Release: 47%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -162,6 +162,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.11.1-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 03 2023 Python Maint - 1.11.1-46 - Rebuilt for Python 3.12 From 9879c3bdb5219dcba152fc8de5c5c079276bc26f Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Fri, 6 Oct 2023 21:23:21 +0100 Subject: [PATCH 36/66] Add python3-nose build dependeny --- vigra.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 1691063..d63d4f7 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 47%{?dist} +Release: 48%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -48,6 +48,7 @@ BuildRequires: cmake(Imath) BuildRequires: OpenEXR-devel %endif BuildRequires: python3-numpy-f2py +BuildRequires: python3-nose BuildRequires: boost-python3 BuildRequires: boost-python3-devel %else @@ -162,6 +163,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Oct 06 2023 Bruno Postle - 1.11.1-48 +- Add python3-nose build dependency + * Sat Jul 22 2023 Fedora Release Engineering - 1.11.1-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 25fc581843ceffa0a7240cc5fed79f4af3fc94aa Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Fri, 6 Oct 2023 22:08:50 +0100 Subject: [PATCH 37/66] try and avoid using numpy.distutils by setting PYTHON_NUMPY_INCLUDE_DIR --- vigra.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index d63d4f7..20e37f6 100644 --- a/vigra.spec +++ b/vigra.spec @@ -104,6 +104,7 @@ sed -i 's=SET(BOOST_PYTHON_NAMES=& boost_python%{python3_version_nodots}=' \ export CXXFLAGS="%{optflags} -DH5_USE_110_API" %cmake -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \ + -DPYTHON_NUMPY_INCLUDE_DIR=%{_includedir}/numpy \ -DWITH_VIGRANUMPY=1 -DPYTHON_VERSION=%{python3_version} %cmake_build %else @@ -164,7 +165,7 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %changelog * Fri Oct 06 2023 Bruno Postle - 1.11.1-48 -- Add python3-nose build dependency +- Add python3-nose build dependency, try and avoid numpy.distutils * Sat Jul 22 2023 Fedora Release Engineering - 1.11.1-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c0b8a0be59c44d4b25317749744400d529658358 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Jan 2024 00:50:09 +0000 Subject: [PATCH 38/66] Rebuilt for Boost 1.83 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 20e37f6..0da2393 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 48%{?dist} +Release: 49%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -164,6 +164,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Thu Jan 18 2024 Jonathan Wakely - 1.11.1-49 +- Rebuilt for Boost 1.83 + * Fri Oct 06 2023 Bruno Postle - 1.11.1-48 - Add python3-nose build dependency, try and avoid numpy.distutils From 7b0448c8ac6675b3437cb6ccb87f806fbbf02145 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:44:00 +0000 Subject: [PATCH 39/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 0da2393..9facdbd 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 49%{?dist} +Release: 50%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -164,6 +164,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.11.1-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jonathan Wakely - 1.11.1-49 - Rebuilt for Boost 1.83 From b445e8dd07b1dc547c74aea47622c2fcf0803da6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 13 Mar 2024 00:56:37 -0400 Subject: [PATCH 40/66] Fix flatpak build Installation path macros must be consistently used for the benefit of flatpak builds. --- vigra.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vigra.spec b/vigra.spec index 9facdbd..99b5cd1 100644 --- a/vigra.spec +++ b/vigra.spec @@ -105,7 +105,8 @@ sed -i 's=SET(BOOST_PYTHON_NAMES=& boost_python%{python3_version_nodots}=' \ export CXXFLAGS="%{optflags} -DH5_USE_110_API" %cmake -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \ -DPYTHON_NUMPY_INCLUDE_DIR=%{_includedir}/numpy \ - -DWITH_VIGRANUMPY=1 -DPYTHON_VERSION=%{python3_version} + -DWITH_VIGRANUMPY=1 -DVIGRANUMPY_INSTALL_DIR=%{python3_sitearch} \ + -DPYTHON_VERSION=%{python3_version} %cmake_build %else sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python}=' \ @@ -133,7 +134,7 @@ mv %{buildroot}/%{_libdir}/vigranumpy/VigranumpyConfig.cmake \ make install DESTDIR=%{buildroot} %endif -rm -rf %{buildroot}/usr/doc +rm -rf %{buildroot}%{_prefix}/doc ( cd $RPM_BUILD_ROOT%{_bindir} mv vigra-config vigra-config-%{__isa_bits} From f22213e12a3344f07bc4b7603cd33cd4dcf94e21 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Wed, 13 Mar 2024 20:18:38 +0000 Subject: [PATCH 41/66] Fixes for the benefit of flatpak builds (yselkowitz) --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 99b5cd1..458ed9b 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 50%{?dist} +Release: 51%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -165,6 +165,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Wed Mar 13 2024 Bruno Postle - 1.11.1-51 +- Fixes for the benefit of flatpak builds (yselkowitz) + * Sat Jan 27 2024 Fedora Release Engineering - 1.11.1-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 96ffe26c7f3e80a7db3293a1d2bf9aa8504539b8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 24 Apr 2024 09:12:36 -0400 Subject: [PATCH 42/66] Rebuilt for openexr 3.2.4 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 458ed9b..d10fc5f 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 51%{?dist} +Release: 52%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -165,6 +165,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Wed Apr 24 2024 Benjamin A. Beasley - 1.11.1-52 +- Rebuilt for openexr 3.2.4 + * Wed Mar 13 2024 Bruno Postle - 1.11.1-51 - Fixes for the benefit of flatpak builds (yselkowitz) From e718beab94a22dfca2f8c077f14fc571d42aed4a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 12:18:37 +0200 Subject: [PATCH 43/66] Rebuilt for Python 3.13 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index d10fc5f..3b02347 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 52%{?dist} +Release: 53%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -165,6 +165,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sun Jun 09 2024 Python Maint - 1.11.1-53 +- Rebuilt for Python 3.13 + * Wed Apr 24 2024 Benjamin A. Beasley - 1.11.1-52 - Rebuilt for openexr 3.2.4 From 7e2dbd9ab8457e390e43942b9b3e3d92b2056eb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:45:40 +0000 Subject: [PATCH 44/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 3b02347..4958c6f 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 53%{?dist} +Release: 54%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -165,6 +165,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.11.1-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 09 2024 Python Maint - 1.11.1-53 - Rebuilt for Python 3.13 From 1c245457e57844394049cf4fec1ad9fd0bea02ae Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:32:46 -0600 Subject: [PATCH 45/66] Rebuild for hdf5 1.14.5 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 4958c6f..57b525e 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.1 -Release: 54%{?dist} +Release: 55%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz @@ -165,6 +165,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Fri Oct 25 2024 Orion Poplawski - 1.11.1-55 +- Rebuild for hdf5 1.14.5 + * Sat Jul 20 2024 Fedora Release Engineering - 1.11.1-54 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8df93f53c86aab75e3f0d71430c532239a7db206 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sat, 30 Nov 2024 13:26:29 +0000 Subject: [PATCH 46/66] Upstream maintenance release, remove defunct patches --- .gitignore | 1 + sources | 3 +-- vigra.spec | 45 ++++++++++++++------------------------------- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 230c39e..157bd28 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ vigra-1.7.0-src.tar.gz /vigra-1.11.0-src-clean.tar.gz /vigra-1.11.1-src.tar.gz /vigra-1.11.1-src-clean.tar.gz +/vigra-1.11.2-src-clean.tar.gz diff --git a/sources b/sources index 1cc37a4..8ee6354 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (vigra-1.11.1-src-clean.tar.gz) = 38c500dacf7a8b8bba22bd3aabaacd061589f76331f9ccf17c52096fa82ff510e531f2120326970789e0f22c4584c35fcb7bfc0eaffce80bea28e2f545a0e12f -SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9 +SHA512 (vigra-1.11.2-src-clean.tar.gz) = 910b014467df692d9f598c010d4803789bd9c18d0d8a153e6a7ecaecfecc931bb768c98ac60d7d9fb8796736f503d8a65cec67efbccb240e795af68f3ba58e4c diff --git a/vigra.spec b/vigra.spec index 57b525e..ad2acbb 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,30 +1,19 @@ Summary: Generic Programming for Computer Vision Name: vigra -Version: 1.11.1 -Release: 55%{?dist} +Version: 1.11.2 +Release: 1%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. -# wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz -# tar xf vigra-1.11.1-src.tar.gz -# find vigra-1.11.1/ -name "lenna*" -delete -# tar zcf vigra-1.11.1-src-clean.tar.gz vigra-1.11.1/ +# wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-11-2.tar.gz +# tar -zxvf Version-1-11-2.tar.gz +# mv vigra-Version-1-11-2 vigra-1.11.2 +# find vigra-1.11.2/ -name "lenna*" -delete +# tar zcf vigra-1.11.2-src-clean.tar.gz vigra-1.11.2/ Source0: %{name}-%{version}-src-clean.tar.gz Source1: vigra-config.sh -# Backported from upstream master, fixes a build failure: -# https://github.com/ukoethe/vigra/issues/414 -Patch0: https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch # Avoid attempt to install non-free 'lenna' files Patch1: vigra-1.10.0-no-lenna.patch Patch2: vigra-1.11.1.docdir.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1597394 -Patch3: vigra-1.11.1.py37.patch -# As of OpenEXR 3 upstream has significantly reorganized the libraries -# including splitting out imath as a standalone library (which this project may -# or may not need). Please see -# https://github.com/AcademySoftwareFoundation/Imath/blob/master/docs/PortingGuide2-3.md -# for porting details and encourage upstream to support it. -# Minimal patch provided. -Patch4: vigra-openexr3.patch URL: http://ukoethe.github.io/vigra/ BuildRequires: make BuildRequires: gcc-c++ @@ -41,12 +30,8 @@ Requires: python3 BuildRequires: hdf5-devel BuildRequires: python3-setuptools BuildRequires: python3-sphinx -%if 0%{?fedora} > 34 BuildRequires: cmake(OpenEXR) BuildRequires: cmake(Imath) -%else -BuildRequires: OpenEXR-devel -%endif BuildRequires: python3-numpy-f2py BuildRequires: python3-nose BuildRequires: boost-python3 @@ -62,8 +47,6 @@ structures. By using template techniques similar to those in the C++ Standard Template Library, you can easily adapt any VIGRA component to the needs of your application without thereby giving up execution speed. -#' - %package devel Summary: Development tools for programs which will use the vigra library Requires: %{name}%{?_isa} = %{version}-%{release} @@ -136,14 +119,10 @@ make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{_prefix}/doc ( - cd $RPM_BUILD_ROOT%{_bindir} + cd %{buildroot}%{_bindir} mv vigra-config vigra-config-%{__isa_bits} ) -install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config - -#fixme: this fails, -#%check -#make VERBOSE=1 check +install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %ldconfig_scriptlets @@ -156,7 +135,7 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %{_bindir}/vigra-config* %{_libdir}/libvigraimpex.so %{_libdir}/vigra -%doc doc/vigra doc/vigranumpy +%doc doc/vigra %if ! 0%{?rhel} %files -n python3-vigra @@ -165,6 +144,10 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config %endif %changelog +* Sat Nov 30 2024 Bruno Postle - 1.11.2-1 +- Upstream maintenance release +- dropped vigra-1.11.1.py37.patch, 81958d302494e137f98a8b1d7869841532f90388.patch and vigra-openexr3.patch + * Fri Oct 25 2024 Orion Poplawski - 1.11.1-55 - Rebuild for hdf5 1.14.5 From c6bd733775681be0d2c8713380dbf885452b6fb5 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sat, 30 Nov 2024 13:34:47 +0000 Subject: [PATCH 47/66] re-add vigra-sources.sh to sources file --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 8ee6354..070ff9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vigra-1.11.2-src-clean.tar.gz) = 910b014467df692d9f598c010d4803789bd9c18d0d8a153e6a7ecaecfecc931bb768c98ac60d7d9fb8796736f503d8a65cec67efbccb240e795af68f3ba58e4c +SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9 From d285db0d71ef72ecf729364104ad1749668f29be Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sat, 30 Nov 2024 13:44:14 +0000 Subject: [PATCH 48/66] update sources properly --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 070ff9e..48348b7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9 +SHA512 (vigra-1.11.2-src-clean.tar.gz) = 910b014467df692d9f598c010d4803789bd9c18d0d8a153e6a7ecaecfecc931bb768c98ac60d7d9fb8796736f503d8a65cec67efbccb240e795af68f3ba58e4c From 364ade8e74a1425b06b0c2e303f1aeffbe023975 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Dec 2024 13:21:54 -0700 Subject: [PATCH 49/66] Rebuild with numpy 2.x (rhbz#2333964) --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index ad2acbb..a251927 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-11-2.tar.gz @@ -144,6 +144,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Tue Dec 24 2024 Orion Poplawski - 1.11.2-2 +- Rebuild with numpy 2.x (rhbz#2333964) + * Sat Nov 30 2024 Bruno Postle - 1.11.2-1 - Upstream maintenance release - dropped vigra-1.11.1.py37.patch, 81958d302494e137f98a8b1d7869841532f90388.patch and vigra-openexr3.patch From 4319882a5224c7e31ee9b97a5fbb69cd0afe2ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 14 Dec 2024 14:56:47 +0100 Subject: [PATCH 50/66] Drop a test dependency on deprecated python3-nose - https://fedoraproject.org/wiki/Changes/DeprecateNose I think the test don't run during the build at all, but if they will one day, this will be necessary. --- vigra-1.11.2-nose-to-pytest.patch | 566 ++++++++++++++++++++++++++++++ vigra.spec | 13 +- 2 files changed, 577 insertions(+), 2 deletions(-) create mode 100644 vigra-1.11.2-nose-to-pytest.patch diff --git a/vigra-1.11.2-nose-to-pytest.patch b/vigra-1.11.2-nose-to-pytest.patch new file mode 100644 index 0000000..6d9d000 --- /dev/null +++ b/vigra-1.11.2-nose-to-pytest.patch @@ -0,0 +1,566 @@ +From 4f801f896a44bcad723a0c253a2a6eb000f50e23 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sat, 30 Sep 2023 15:36:36 -0400 +Subject: [PATCH 1/3] Migrate to pytest + +--- + config/FindVIGRANUMPY_DEPENDENCIES.cmake | 14 +++++++------- + docsrc/installation.dxx | 2 +- + vigranumpy/test/CMakeLists.txt | 10 +++++----- + vigranumpy/test/test_arraytypes.py | 21 ++++++++++++++++----- + 4 files changed, 29 insertions(+), 18 deletions(-) + +diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake +index 964ae92..c1a6495 100644 +--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake ++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake +@@ -99,13 +99,13 @@ IF(Python_Interpreter_FOUND) + # + ###################################################################### + execute_process(COMMAND ${Python_EXECUTABLE} -c +- "import nose" +- RESULT_VARIABLE PYTHON_NOSETESTS_NOT_FOUND) ++ "import pytest" ++ RESULT_VARIABLE PYTHON_PYTEST_NOT_FOUND) + +- IF(NOT PYTHON_NOSETESTS_NOT_FOUND) +- MESSAGE(STATUS "Searching for Python nosetests: ok") ++ IF(NOT PYTHON_PYTEST_NOT_FOUND) ++ MESSAGE(STATUS "Searching for Python pytest: ok") + ELSE() +- MESSAGE(STATUS "Could NOT find Python nosetests ('import nose' failed)") ++ MESSAGE(STATUS "Could NOT find Python pytest ('import pytest' failed)") + ENDIF() + + ###################################################################### +@@ -160,8 +160,8 @@ IF(Python_Interpreter_FOUND) + if(TEST_VIGRANUMPY AND NOT VIGRANUMPY_DEPENDENCIES_FOUND) + MESSAGE(FATAL_ERROR " vigranumpy dependencies NOT found while TEST_VIGRANUMPY=1") + endif() +- if(TEST_VIGRANUMPY AND PYTHON_NOSETESTS_NOT_FOUND) +- MESSAGE(FATAL_ERROR " nosetests NOT found while TEST_VIGRANUMPY=1") ++ if(TEST_VIGRANUMPY AND PYTHON_PYTEST_NOT_FOUND) ++ MESSAGE(FATAL_ERROR " pytest NOT found while TEST_VIGRANUMPY=1") + endif() + ELSE() + MESSAGE(STATUS "Python not found. Make sure that Python is in your PATH or set the appropriate variables as described in https://cmake.org/cmake/help/latest/module/FindPython.html") +diff --git a/docsrc/installation.dxx b/docsrc/installation.dxx +index e02e460..b44d21e 100755 +--- a/docsrc/installation.dxx ++++ b/docsrc/installation.dxx +@@ -13,7 +13,7 @@ +
  • doxygen and Python to generate C++ documentation. +
  • Python, boost_python, and numpy to compile and run vigranumpy (the VIGRA Python bindings). +
  • sphinx to generate vigranumpy documentation. +-
  • nosetests to execute the vigranumpy test suite. ++
  • pytest to execute the vigranumpy test suite. + + + These dependencies are optional - the functionality will simply be unavailable if the libraries cannot be found. +diff --git a/vigranumpy/test/CMakeLists.txt b/vigranumpy/test/CMakeLists.txt +index 1c267a5..eca7c5f 100644 +--- a/vigranumpy/test/CMakeLists.txt ++++ b/vigranumpy/test/CMakeLists.txt +@@ -84,7 +84,7 @@ else() + endif() + endif() + +-IF(NOT PYTHON_NOSETESTS_NOT_FOUND) ++IF(NOT PYTHON_PYTEST_NOT_FOUND) + # copy the individual test scripts + FOREACH(test_script ${TEST_SCRIPTS}) + ADD_CUSTOM_COMMAND( +@@ -122,7 +122,7 @@ IF(NOT PYTHON_NOSETESTS_NOT_FOUND) + get_filename_component(PYTHON_PATH ${Python_EXECUTABLE} PATH) + get_filename_component(PYTHON_EXE ${Python_EXECUTABLE} NAME) + SET(EXTRA_PATH "${PYTHON_PATH}${PATHSEP}${EXTRA_PATH}") +- SET(VIGRA_TEST_EXECUTABLE "${PYTHON_EXE} -c \"import nose; nose.main()\" . %CONFIGURATION%") ++ SET(VIGRA_TEST_EXECUTABLE "${PYTHON_EXE} -m pytest . %CONFIGURATION%") + SET(VIGRA_TEST_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/run_vigranumpytest.bat") + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config/run_test.bat.in + ${VIGRA_TEST_SCRIPT}.in +@@ -130,7 +130,7 @@ IF(NOT PYTHON_NOSETESTS_NOT_FOUND) + file(GENERATE OUTPUT "${VIGRA_TEST_SCRIPT}" + INPUT "${VIGRA_TEST_SCRIPT}.in") + ELSE() +- SET(VIGRA_TEST_EXECUTABLE "${Python_EXECUTABLE} -c \"import nose; nose.main()\" .") ++ SET(VIGRA_TEST_EXECUTABLE "${Python_EXECUTABLE} -m pytest .") + SET(VIGRA_TEST_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/run_vigranumpytest.sh") + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config/run_test.sh.in + ${VIGRA_TEST_SCRIPT}.in +@@ -161,11 +161,11 @@ IF(NOT PYTHON_NOSETESTS_NOT_FOUND) + if(MSVC AND NOT (MSVC_VERSION VERSION_LESS "11")) + # FIXME: this may not portable between VC versions (works for 11.0 - 14.0) + set(VIGRA_TEST_EXE "${Python_EXECUTABLE}") +- set(VIGRA_TEST_ARGS "-c \"import nose; nose.main()\" . \$(Configuration)") ++ set(VIGRA_TEST_ARGS "-m pytest . \$(Configuration)") + configure_file(${CMAKE_SOURCE_DIR}/config/testdebug.vcxproj.user.in + ${CMAKE_CURRENT_BINARY_DIR}/vigranumpytest.vcxproj.user + @ONLY) + endif() + ELSE() +- MESSAGE(STATUS " vigranumpy tests will NOT be executed (nosetests missing)") ++ MESSAGE(STATUS " vigranumpy tests will NOT be executed (pytest missing)") + ENDIF() +diff --git a/vigranumpy/test/test_arraytypes.py b/vigranumpy/test/test_arraytypes.py +index a0d92be..fb3f7bc 100644 +--- a/vigranumpy/test/test_arraytypes.py ++++ b/vigranumpy/test/test_arraytypes.py +@@ -33,21 +33,19 @@ + # + ####################################################################### + +-# run with a simple 'nosetests' in this directory +-# (and nose installed, i.e. 'easy_install nose') ++# run with a simple 'pytest' in this directory ++# (and pytest installed, i.e. 'pip install pytest' or 'conda install pytest') + + from __future__ import division, print_function + from functools import reduce + + import sys +-print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + # import vigra # FIXME: without this line, C++ constructors don't find VigraArray + import vigra.arraytypes as arraytypes + import vigra.ufunc as ufunc + import numpy, copy + import vigranumpytest as vt +-from nose.tools import assert_equal, raises, assert_true + + from vigra.arraytypes import AxisTags, AxisInfo + import platform +@@ -75,6 +73,19 @@ for n, f in vt.__dict__.items(): + if n.startswith('test'): + allTests.add(n) + ++# 2023/09 ++# Small compatibility shims with old code that used ++# assert_equal and assert_true ++# from nosetest. Rewriting the tests to use python's assert statement ++# was decided to be too invasive. ++def assert_equal(x, y): ++ assert x == y ++ ++ ++def assert_true(x): ++ assert x ++ ++ + def checkShape(shape1, shape2): + assert_equal(shape1, shape2) + +@@ -455,7 +466,7 @@ def checkCompatibility(obj, compatible): + except Exception: + print("exception in %s with shape %s strides %s tags (%s)" % (n, obj.shape, obj.strides, + repr(getattr(obj, "axistags", "none")))) +- raise ++ raise + + def testAxisTags(): + axistags = AxisTags(AxisInfo.c(description="RGB"), +From 980e3b816818cefc7c2ee57e69929126be075c92 Mon Sep 17 00:00:00 2001 +From: Alexandre Detiste +Date: Sun, 4 Aug 2024 00:49:32 +0200 +Subject: [PATCH 2/3] remove more Nose usage + +--- + vigranumpy/test/test1.py | 36 +++++++++++++++--------------- + vigranumpy/test/test2.py | 1 - + vigranumpy/test/test3.py | 3 +-- + vigranumpy/test/test4.py | 13 +++++------ + vigranumpy/test/test_arraytypes.py | 21 ++++++++--------- + vigranumpy/test/test_color.py | 23 ++++++++----------- + vigranumpy/test/test_impex.py | 5 ++--- + vigranumpy/test/test_multidef.py | 2 +- + 8 files changed, 46 insertions(+), 58 deletions(-) + +diff --git a/vigranumpy/test/test1.py b/vigranumpy/test/test1.py +index bd63937..b341e9c 100644 +--- a/vigranumpy/test/test1.py ++++ b/vigranumpy/test/test1.py +@@ -38,7 +38,7 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_equal, raises, assert_raises ++from nose.tools import raises, assert_raises + import vigra + import numpy as np + from vigra.analysis import * +@@ -68,10 +68,10 @@ def checkShape(shape1, shape2): + shape1 = shape1.shape + if isinstance(shape2, np.ndarray): + shape2 = shape2.shape +- assert_equal(shape1, shape2) ++ assert shape1 == shape2 + + def checkType(i,type): +- assert_equal(i.dtype, type) ++ assert i.dtype == type + + def checkAboutSame(i1,i2): + compare_shapes(i1.shape, i2.shape) +@@ -178,8 +178,8 @@ def test_MinimaMaxima(): + + def test_Region2Crack(): + res = regionImageToCrackEdgeImage(img_scalar_i) +- assert_equal(img_scalar_f.shape[0]*2-1, res.shape[0]) +- assert_equal(img_scalar_f.shape[1]*2-1, res.shape[1]) ++ assert img_scalar_f.shape[0]*2-1 == res.shape[0] ++ assert img_scalar_f.shape[1]*2-1 == res.shape[1] + checkType(res,res.dtype) + + regionImageToCrackEdgeImage(img_scalar_i64[0:100,0:100], 1, img_scalar_i64) +@@ -232,8 +232,8 @@ def test_edges(): + checkType(res, np.uint8) + + res = shenCastanCrackEdgeImage(img_scalar_f, 1,128,255) +- assert_equal(img_scalar_f.shape[0]*2-1, res.shape[0]) +- assert_equal(img_scalar_f.shape[1]*2-1, res.shape[1]) ++ assert img_scalar_f.shape[0]*2-1 == res.shape[0] ++ assert img_scalar_f.shape[1]*2-1 == res.shape[1] + + res1 = beautifyCrackEdgeImage(res, 1, 0) + checkShape(res1, res) +@@ -248,29 +248,29 @@ def test_edges(): + checkType(res, np.uint8) + + res = boundaryTensor2D(img_scalar_f, 1) +- assert_equal(img_scalar_f.shape[0], res.shape[0]) +- assert_equal(img_scalar_f.shape[1], res.shape[1]) +- assert_equal(res.shape[2], 3) ++ assert img_scalar_f.shape[0] == res.shape[0] ++ assert img_scalar_f.shape[1] == res.shape[1] ++ assert res.shape[2] == 3 + checkType(res, np.float32) + + res = hourGlassFilter2D(img_multi_f, 1, 2) +- assert_equal(img_multi_f.shape[0], res.shape[0]) +- assert_equal(img_multi_f.shape[1], res.shape[1]) ++ assert img_multi_f.shape[0] == res.shape[0] ++ assert img_multi_f.shape[1] == res.shape[1] + checkType(res, np.float32) + + res = tensorEigenRepresentation2D(img_multi_f) +- assert_equal(img_multi_f.shape[0], res.shape[0]) +- assert_equal(img_multi_f.shape[1], res.shape[1]) ++ assert img_multi_f.shape[0] == res.shape[0] ++ assert img_multi_f.shape[1] == res.shape[1] + checkType(res, np.float32) + + res = tensorTrace(img_multi_f) +- assert_equal(img_multi_f.shape[0], res.shape[0]) +- assert_equal(img_multi_f.shape[1], res.shape[1]) ++ assert img_multi_f.shape[0] == res.shape[0] ++ assert img_multi_f.shape[1] == res.shape[1] + checkType(res, np.float32) + + res = rieszTransformOfLOG2D(img_scalar_f, 1, 1, 1) +- assert_equal(img_multi_f.shape[0], res.shape[0]) +- assert_equal(img_multi_f.shape[1], res.shape[1]) ++ assert img_multi_f.shape[0] == res.shape[0] ++ assert img_multi_f.shape[1] == res.shape[1] + checkType(res, np.float32) + + +diff --git a/vigranumpy/test/test2.py b/vigranumpy/test/test2.py +index dd23543..f5cd64e 100644 +--- a/vigranumpy/test/test2.py ++++ b/vigranumpy/test/test2.py +@@ -38,7 +38,6 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_equal, raises + import numpy as np + from vigra import * + from vigra.filters import * +diff --git a/vigranumpy/test/test3.py b/vigranumpy/test/test3.py +index e13dd81..c86e6a8 100644 +--- a/vigranumpy/test/test3.py ++++ b/vigranumpy/test/test3.py +@@ -38,7 +38,6 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_equal, raises + import numpy as np + from vigra import * + from vigra import arraytypes as at +@@ -67,7 +66,7 @@ def checkShape(shape1, shape2): + shape1 = shape1.shape + if isinstance(shape2, np.ndarray): + shape2 = shape2.shape +- assert_equal(shape1, shape2) ++ assert shape1 == shape2 + + def checkImages(i1,i2): + checkShape(i1.shape, i2.shape) +diff --git a/vigranumpy/test/test4.py b/vigranumpy/test/test4.py +index bf89970..43f1bff 100644 +--- a/vigranumpy/test/test4.py ++++ b/vigranumpy/test/test4.py +@@ -39,7 +39,6 @@ print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + + +-from nose.tools import assert_equal, raises + import numpy as np + import numpy as numpy + from vigra import graphs as vigraph +@@ -273,17 +272,17 @@ class TestGraph(object): + g.addNode(3) + nodes = [n for n in g.nodeIter()] + assert len(nodes)==1 +- assert g.id(nodes[0]) == 3 ++ assert g.id(nodes[0]) == 3 + + g.addNode(6) + nodes = [n for n in g.nodeIter()] + assert len(nodes)==2 +- assert g.id(nodes[0]) == 3 +- assert g.id(nodes[1]) == 6 ++ assert g.id(nodes[0]) == 3 ++ assert g.id(nodes[1]) == 6 + + g.addNode(2) + nodes = [n for n in g.nodeIter()] + assert len(nodes)==3 +- assert g.id(nodes[0]) == 2 +- assert g.id(nodes[1]) == 3 +- assert g.id(nodes[2]) == 6 +\ No newline at end of file ++ assert g.id(nodes[0]) == 2 ++ assert g.id(nodes[1]) == 3 ++ assert g.id(nodes[2]) == 6 +diff --git a/vigranumpy/test/test_arraytypes.py b/vigranumpy/test/test_arraytypes.py +index fb3f7bc..9251b95 100644 +--- a/vigranumpy/test/test_arraytypes.py ++++ b/vigranumpy/test/test_arraytypes.py +@@ -75,16 +75,13 @@ for n, f in vt.__dict__.items(): + + # 2023/09 + # Small compatibility shims with old code that used +-# assert_equal and assert_true ++# assert_equal + # from nosetest. Rewriting the tests to use python's assert statement + # was decided to be too invasive. + def assert_equal(x, y): + assert x == y + + +-def assert_true(x): +- assert x +- + + def checkShape(shape1, shape2): + assert_equal(shape1, shape2) +@@ -177,7 +174,7 @@ def checkArray(cls, channels, dim, hasChannelAxis=True): + if channels > 1: + assert_equal(img.order, "V" if hasChannelAxis else "F") + else: +- assert_true(img.order in ['V', 'F']) ++ assert img.order in ['V', 'F'] + assert_equal(img.flags.c_contiguous, False) + + # test axistags +@@ -186,7 +183,7 @@ def checkArray(cls, channels, dim, hasChannelAxis=True): + assert_equal(img.withAxes('y', 'z', 'x', 'c').axistags, axistags4) + assert_equal(img.withAxes('yzxc').axistags, axistags4) + assert_equal(img.withAxes(axistags4).axistags, axistags4) +- assert_true(img.withAxes(img.axistags) is img) ++ assert img.withAxes(img.axistags) is img + array = img.noTags() + assert_equal(type(array), numpy.ndarray) + assert_equal(arraytypes.taggedView(array, vaxistags).axistags, vaxistags) +@@ -265,7 +262,7 @@ def checkArray(cls, channels, dim, hasChannelAxis=True): + if channels > 1: + assert_equal(img.order, "V" if hasChannelAxis else "F") + else: +- assert_true(img.order in ['V', 'F']) ++ assert img.order in ['V', 'F'] + assert_equal(img.flags.c_contiguous, False) + assert_equal(img.axistags, vaxistags) + img[1,2] = value +@@ -319,7 +316,7 @@ def checkArray(cls, channels, dim, hasChannelAxis=True): + if channels > 1: + assert_equal(img.order, "V" if hasChannelAxis else "F") + else: +- assert_true(img.order in ['V', 'F']) ++ assert img.order in ['V', 'F'] + assert_equal(b.axistags, img.axistags) + assert_equal(b.flags.c_contiguous, False) + assert (b==img).all() +@@ -1379,7 +1376,7 @@ def testSlicing(): + assert_equal(tags, a.axistags) + + b = a[...] +- assert_true((a==b).all()) ++ assert (a==b).all() + assert_equal(tags, b.axistags) + + b = a[...,0] +@@ -1420,17 +1417,17 @@ def testSlicing(): + + b = a.subarray((4,3,2)) + assert_equal(b.shape, (4,3,2,2)) +- assert_true((a[:4,:3,:2,:]==b).all()) ++ assert (a[:4,:3,:2,:]==b).all() + assert_equal(tags, b.axistags) + + b = a.subarray((1,1,1),(4,3,2)) + assert_equal(b.shape, (3,2,1,2)) +- assert_true((a[1:4,1:3,1:2]==b).all()) ++ assert (a[1:4,1:3,1:2]==b).all() + assert_equal(tags, b.axistags) + + b = a.subarray((1,1,1,1),(4,3,2,2)) + assert_equal(b.shape, (3,2,1,1)) +- assert_true((a[1:4,1:3,1:2,1:]==b).all()) ++ assert (a[1:4,1:3,1:2,1:]==b).all() + assert_equal(tags, b.axistags) + + def testMethods(): +diff --git a/vigranumpy/test/test_color.py b/vigranumpy/test/test_color.py +index 5551a97..74139e2 100644 +--- a/vigranumpy/test/test_color.py ++++ b/vigranumpy/test/test_color.py +@@ -38,7 +38,6 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_equal, raises, assert_raises, assert_true + import vigra + import numpy + +@@ -69,8 +68,8 @@ def test_gray2qimage(): + tmp2 = vigra.impex.readImage("tmp2.png") + + for i in range(3): +- assert_true( (tmp1 == tmp2[:,:,i]).all() ) +- assert_true( (tmp2[:,:,3] == 255).all() ) ++ assert (tmp1 == tmp2[:,:,i]).all() ++ assert (tmp2[:,:,3] == 255).all() + + def test_alphamodulated2qimage(): + if not _have_qt: +@@ -93,15 +92,11 @@ def test_alphamodulated2qimage(): + tmp2 = byte_view(img) + tmp2 = tmp2.swapaxes(0,1) + +- assert_true( tmp1.shape[0:2] == tmp2.shape[0:2] ) +- assert_true( tmp2.ndim == 3 ) +- assert_true( tmp2.shape[2] == 4 ) ++ assert tmp1.shape[0:2] == tmp2.shape[0:2] ++ assert tmp2.ndim == 3 ++ assert tmp2.shape[2] == 4 + +- assert_true( (tmp2[:,:,0] == 0).all() ) +- assert_true( (tmp2[:,:,2] == 0).all() ) +- assert_true( (tmp2[:,:,3] == tmp1).all() ) +- assert_true( (tmp2[:,:,1] == tmp1).all() ) +- +-if __name__ == '__main__': +- import nose +- nose.run(defaultTest=__file__) ++ assert (tmp2[:,:,0] == 0).all() ++ assert (tmp2[:,:,2] == 0).all() ++ assert (tmp2[:,:,3] == tmp1).all() ++ assert (tmp2[:,:,1] == tmp1).all() +diff --git a/vigranumpy/test/test_impex.py b/vigranumpy/test/test_impex.py +index 3a2a0f5..0e94d17 100644 +--- a/vigranumpy/test/test_impex.py ++++ b/vigranumpy/test/test_impex.py +@@ -38,7 +38,6 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_equal, raises + import numpy as np + import vigra.vigranumpycore # FIXME: why is this needed? (without, impex returns ndarray) + import vigra.impex as im +@@ -58,11 +57,11 @@ volumeFloat=at.Volume(np.random.rand(3,4,5,6)*100,dtype=np.float32, + axistags=at.VigraArray.defaultAxistags(4, 'C')) + + def checkEqualData(i1,i2): +- assert_equal(i1.shape, i2.shape) ++ assert i1.shape == i2.shape + assert(np.all(i1==i2)) + + def checkUnequalData(i1,i2): +- assert_equal(i1.shape, i2.shape) ++ assert i1.shape == i2.shape + assert(np.any(i1!=i2)) + + def test_multiImageTiff(): +diff --git a/vigranumpy/test/test_multidef.py b/vigranumpy/test/test_multidef.py +index a993a22..ad66846 100644 +--- a/vigranumpy/test/test_multidef.py ++++ b/vigranumpy/test/test_multidef.py +@@ -38,7 +38,7 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_equal, raises, assert_raises ++from nose.tools import assert_raises + import vigra + import numpy as np + +From 2b9b6e2b30f84b441dcc2119e408dac208d04f09 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sun, 4 Aug 2024 12:13:10 -0400 +Subject: [PATCH 3/3] Remove nose as test dependency + +--- + vigranumpy/test/test1.py | 8 +++++++- + vigranumpy/test/test_multidef.py | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/vigranumpy/test/test1.py b/vigranumpy/test/test1.py +index b341e9c..9f556e3 100644 +--- a/vigranumpy/test/test1.py ++++ b/vigranumpy/test/test1.py +@@ -38,13 +38,19 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import raises, assert_raises ++import pytest + import vigra + import numpy as np + from vigra.analysis import * + from vigra.filters import * + import vigra.arraytypes as at + ++# Compatibility for ++# from nose.tools import assert_raises ++def assert_raises(error, func, *args, **kwargs): ++ with pytest.raises(error): ++ func(*args, **kwargs) ++ + img_rgb_f = at.RGBImage(np.random.rand(100,200,3)*255,dtype=np.float32) + img_scalar_f = at.ScalarImage(np.random.rand(100,200)*255,dtype=np.float32) + img_multi_f = at.Vector3Image(np.random.rand(100,200,3)*255,dtype=np.float32) +diff --git a/vigranumpy/test/test_multidef.py b/vigranumpy/test/test_multidef.py +index ad66846..cd7d042 100644 +--- a/vigranumpy/test/test_multidef.py ++++ b/vigranumpy/test/test_multidef.py +@@ -38,10 +38,16 @@ import sys + print("\nexecuting test file", __file__, file=sys.stderr) + exec(compile(open('set_paths.py', "rb").read(), 'set_paths.py', 'exec')) + +-from nose.tools import assert_raises ++import pytest + import vigra + import numpy as np + ++# Compatibility for ++# from nose.tools import assert_raises ++def assert_raises(error, func, *args, **kwargs): ++ with pytest.raises(error): ++ func(*args, **kwargs) ++ + def checkAboutSame(i1,i2): + assert(i1.shape==i2.shape) + difference=np.sum(np.abs(i1-i2))/float(np.size(i1)) diff --git a/vigra.spec b/vigra.spec index a251927..8f273f3 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-11-2.tar.gz @@ -14,6 +14,11 @@ Source1: vigra-config.sh # Avoid attempt to install non-free 'lenna' files Patch1: vigra-1.10.0-no-lenna.patch Patch2: vigra-1.11.1.docdir.patch +# Switch from nose to pytest: +# https://github.com/ukoethe/vigra/commit/7db3841c7e +# https://github.com/ukoethe/vigra/commit/e32c60b621 +# https://github.com/ukoethe/vigra/commit/3729909b98 +Patch3: vigra-1.11.2-nose-to-pytest.patch URL: http://ukoethe.github.io/vigra/ BuildRequires: make BuildRequires: gcc-c++ @@ -33,7 +38,7 @@ BuildRequires: python3-sphinx BuildRequires: cmake(OpenEXR) BuildRequires: cmake(Imath) BuildRequires: python3-numpy-f2py -BuildRequires: python3-nose +BuildRequires: python3-pytest BuildRequires: boost-python3 BuildRequires: boost-python3-devel %else @@ -144,6 +149,10 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Thu Jan 02 2025 Miro Hrončok - 1.11.2-3 +- Drop a test dependency on deprecated python3-nose +- https://fedoraproject.org/wiki/Changes/DeprecateNose + * Tue Dec 24 2024 Orion Poplawski - 1.11.2-2 - Rebuild with numpy 2.x (rhbz#2333964) From c5dcefb4bfe0f302f665807d1f844dfe29971086 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:19:39 +0000 Subject: [PATCH 51/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 8f273f3..fdee194 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.11.2 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-11-2.tar.gz @@ -149,6 +149,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.11.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 02 2025 Miro Hrončok - 1.11.2-3 - Drop a test dependency on deprecated python3-nose - https://fedoraproject.org/wiki/Changes/DeprecateNose From 4195457438eec087be619d2a9d322b2e3ec60449 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sun, 26 Jan 2025 22:56:34 +0000 Subject: [PATCH 52/66] Upstream release, build with -Wno-template-body for gcc15 breakage bug #2341506 --- .gitignore | 1 + sources | 3 +-- vigra.spec | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 157bd28..8514617 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ vigra-1.7.0-src.tar.gz /vigra-1.11.1-src.tar.gz /vigra-1.11.1-src-clean.tar.gz /vigra-1.11.2-src-clean.tar.gz +/vigra-1.12.1-src-clean.tar.gz diff --git a/sources b/sources index 48348b7..cba8d61 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9 -SHA512 (vigra-1.11.2-src-clean.tar.gz) = 910b014467df692d9f598c010d4803789bd9c18d0d8a153e6a7ecaecfecc931bb768c98ac60d7d9fb8796736f503d8a65cec67efbccb240e795af68f3ba58e4c +SHA512 (vigra-1.12.1-src-clean.tar.gz) = e42c2d5ce46c95ebe43c817b2b25336fc94fe4dc13393be5f78916b8911603c96baf5783b8f39aa87bee85c36c8ba51fe947519349f9cae7d272cf70ed58a445 diff --git a/vigra.spec b/vigra.spec index fdee194..fcfd20d 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,24 +1,19 @@ Summary: Generic Programming for Computer Vision Name: vigra -Version: 1.11.2 -Release: 4%{?dist} +Version: 1.12.1 +Release: 1%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. -# wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-11-2.tar.gz -# tar -zxvf Version-1-11-2.tar.gz -# mv vigra-Version-1-11-2 vigra-1.11.2 -# find vigra-1.11.2/ -name "lenna*" -delete -# tar zcf vigra-1.11.2-src-clean.tar.gz vigra-1.11.2/ +# wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz +# tar -zxvf Version-1-12-1.tar.gz +# mv vigra-Version-1-12-1 vigra-1.12.1 +# find vigra-1.12.1/ -name "lenna*" -delete +# tar zcf vigra-1.12.1-src-clean.tar.gz vigra-1.12.1/ Source0: %{name}-%{version}-src-clean.tar.gz Source1: vigra-config.sh # Avoid attempt to install non-free 'lenna' files Patch1: vigra-1.10.0-no-lenna.patch Patch2: vigra-1.11.1.docdir.patch -# Switch from nose to pytest: -# https://github.com/ukoethe/vigra/commit/7db3841c7e -# https://github.com/ukoethe/vigra/commit/e32c60b621 -# https://github.com/ukoethe/vigra/commit/3729909b98 -Patch3: vigra-1.11.2-nose-to-pytest.patch URL: http://ukoethe.github.io/vigra/ BuildRequires: make BuildRequires: gcc-c++ @@ -94,7 +89,8 @@ export CXXFLAGS="%{optflags} -DH5_USE_110_API" %cmake -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VALGRIND=0 -DWITH_LEMON=0 \ -DPYTHON_NUMPY_INCLUDE_DIR=%{_includedir}/numpy \ -DWITH_VIGRANUMPY=1 -DVIGRANUMPY_INSTALL_DIR=%{python3_sitearch} \ - -DPYTHON_VERSION=%{python3_version} + -DPYTHON_VERSION=%{python3_version} \ + -DCMAKE_CXX_FLAGS="-Wno-template-body %{build_cxxflags}" %cmake_build %else sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python}=' \ @@ -149,6 +145,10 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Wed Jan 08 2025 Bruno Postle - 1.12.1-1 +- Upstream release +- build with -Wno-template-body for gcc15 breakage bug #2341506 + * Sun Jan 19 2025 Fedora Release Engineering - 1.11.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From bf5df5b94c06d399733fd7e5e4a52e67baf1042b Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sun, 26 Jan 2025 23:03:44 +0000 Subject: [PATCH 53/66] fedpkg new-sources is not pretty, in fact rather plain --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index cba8d61..9592c8d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (vigra-1.12.1-src-clean.tar.gz) = e42c2d5ce46c95ebe43c817b2b25336fc94fe4dc13393be5f78916b8911603c96baf5783b8f39aa87bee85c36c8ba51fe947519349f9cae7d272cf70ed58a445 +SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9 From ea38e6114aaf0b441016ad41107017aa06a76d5a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 00:51:30 +0200 Subject: [PATCH 54/66] Rebuilt for Python 3.14 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index fcfd20d..cdd4cac 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Tue Jun 03 2025 Python Maint - 1.12.1-2 +- Rebuilt for Python 3.14 + * Wed Jan 08 2025 Bruno Postle - 1.12.1-1 - Upstream release - build with -Wno-template-body for gcc15 breakage bug #2341506 From 966f1b55f17a0aff04c2b09992008dd7d82c8893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:04:53 +0000 Subject: [PATCH 55/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index cdd4cac..cf61110 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 1.12.1-2 - Rebuilt for Python 3.14 From 088b6e91b7e8dd6d270064cd57d491423a672288 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:00 +0200 Subject: [PATCH 56/66] Rebuilt for Python 3.14.0rc2 bytecode --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index cf61110..b8f75fe 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Fri Aug 15 2025 Python Maint - 1.12.1-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 1.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 02981d87cdfce026c29627be10e2f61f4133ba0a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:15 +0200 Subject: [PATCH 57/66] Rebuilt for Python 3.14.0rc3 bytecode --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index b8f75fe..af21e29 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Fri Sep 19 2025 Python Maint - 1.12.1-5 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.12.1-4 - Rebuilt for Python 3.14.0rc2 bytecode From c51870c5f8ee28065329f5104d403d09cd763ce4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 18:30:40 +0000 Subject: [PATCH 58/66] Rebuilt for Boost 1.90 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index af21e29..7728686 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Mon Jan 12 2026 Jonathan Wakely - 1.12.1-6 +- Rebuilt for Boost 1.90 + * Fri Sep 19 2025 Python Maint - 1.12.1-5 - Rebuilt for Python 3.14.0rc3 bytecode From 9045c597edfa2f3812dae3c760379a0974631165 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:54:12 +0000 Subject: [PATCH 59/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 7728686..93bf9c7 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.12.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Jan 12 2026 Jonathan Wakely - 1.12.1-6 - Rebuilt for Boost 1.90 From d2a7b915c02fc0d0993c5eb64a0983287d3aec28 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Apr 2026 19:30:39 -0600 Subject: [PATCH 60/66] Rebuild for hdf5 2.1 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 93bf9c7..29924c6 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Fri Apr 17 2026 Orion Poplawski - 1.12.1-8 +- Rebuild for hdf5 2.1 + * Sat Jan 17 2026 Fedora Release Engineering - 1.12.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 5290d7a9287d223c6f5d85766f9b6825f1d1455c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 25 May 2026 08:42:44 -0500 Subject: [PATCH 61/66] Rebuild for OpenEXR 3.4.12. --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 29924c6..a8323e5 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Mon May 25 2026 Richard Shaw - 1.12.1-9 +- Rebuild for OpenEXR 3.4.12. + * Fri Apr 17 2026 Orion Poplawski - 1.12.1-8 - Rebuild for hdf5 2.1 From 486d632150b23ffa50564ebc7e9a9d0aa2a3e21d Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 31 May 2026 14:27:37 -0500 Subject: [PATCH 62/66] Rebuild for OpenColorIO 2.5.2. From 4c7a8973e44fadc4fe1d52f2944adf42c23cec4e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 31 May 2026 14:27:57 -0500 Subject: [PATCH 63/66] Rebuild for OpenColorIO 2.5.2. --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index a8323e5..26cd063 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Sun May 31 2026 Richard Shaw - 1.12.1-10 +- Rebuild for OpenColorIO 2.5.2. + * Mon May 25 2026 Richard Shaw - 1.12.1-9 - Rebuild for OpenEXR 3.4.12. From da098906cd669b2176bf6c05b93c06bce306df7c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 23:26:05 +0200 Subject: [PATCH 64/66] Rebuilt for Python 3.15 --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index 26cd063..c784339 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Thu Jun 04 2026 Python Maint - 1.12.1-11 +- Rebuilt for Python 3.15 + * Sun May 31 2026 Richard Shaw - 1.12.1-10 - Rebuild for OpenColorIO 2.5.2. From 11d34df738c082d0f2a384026fce8dd7699cc0f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:28:48 +0000 Subject: [PATCH 65/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index c784339..c4f161c 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.12.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 1.12.1-11 - Rebuilt for Python 3.15 From 1541b002cf6cbeaa21a7f5e04e0690550b4f8cf5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:11:34 +0200 Subject: [PATCH 66/66] Rebuilt for Python 3.15.0b4 ABI change --- vigra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vigra.spec b/vigra.spec index c4f161c..15ba9f3 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,7 +1,7 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.12.1 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT # The "Lenna" files are non-free, we need to remove them from the source tarball. # wget https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-12-1.tar.gz @@ -145,6 +145,9 @@ install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/vigra-config %endif %changelog +* Wed Jul 22 2026 Python Maint - 1.12.1-13 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 1.12.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild