diff --git a/openjpeg2.spec b/openjpeg2.spec index bd5ecf453ca28d2afa066a323345befe1b90b38b..f678d78778a86b2c5bffe0e3f1383482e2143f6d 100644 --- a/openjpeg2.spec +++ b/openjpeg2.spec @@ -1,12 +1,11 @@ Name: openjpeg2 Version: 2.3.1 -Release: 9 +Release: 10 Summary: C-Library for JPEG 2000 License: BSD and MIT URL: https://github.com/uclouvain/openjpeg Source0: https://github.com/uclouvain/openjpeg/archive/v%{version}/openjpeg-%{version}.tar.gz -Patch0: openjpeg2_remove-thirdparty.patch Patch1: openjpeg2_opj2.patch Patch6000: CVE-2016-10505.patch @@ -51,7 +50,8 @@ applications that use OpenJPEG 2. %prep %autosetup -n openjpeg-%{version} -p1 -rm -rf thirdparty +# Remove all third party libraries just to be sure +find thirdparty/ -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \; %build mkdir %{_target_platform} @@ -101,6 +101,9 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump. %{_mandir}/man3/*.3* %changelog +* Tue Apr 12 2022 dongyuzhen - 2.3.1-10 +- fix the issue of opj2_compress/opj2_decompress don't work with png/tiff images + * Mon Mar 14 2022 dongyuzhen - 2.3.1-9 - fix CVE-2019-12973,CVE-2021-3575 diff --git a/openjpeg2_remove-thirdparty.patch b/openjpeg2_remove-thirdparty.patch deleted file mode 100644 index 12ac763c7c1d35b3da59be89b11fe4de530e6ab5..0000000000000000000000000000000000000000 --- a/openjpeg2_remove-thirdparty.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN openjpeg-2.3.1/CMakeLists.txt openjpeg-2.3.1-new/CMakeLists.txt ---- openjpeg-2.3.1/CMakeLists.txt 2019-04-02 14:45:15.000000000 +0200 -+++ openjpeg-2.3.1-new/CMakeLists.txt 2019-04-02 16:14:13.688252343 +0200 -@@ -278,7 +278,6 @@ if(BUILD_CODEC OR BUILD_MJ2) - # OFF: It will only build 3rd party libs if they are not found on the system - # ON: 3rd party libs will ALWAYS be build, and used - option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) -- add_subdirectory(thirdparty) - add_subdirectory(src/bin) - endif () - add_subdirectory(wrapping)