Fix unbundling 3rd party libraries (#1757822)

openjpeg2.spec

@@ -5,7 +5,7 @@
 
 Name:           openjpeg2
 Version:        2.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C-Library for JPEG 2000
 
 # windirent.h is MIT, the rest is BSD
@@ -17,10 +17,8 @@ Source0:        https://github.com/uclouvain/openjpeg/archive/v%{version}/openjp
 Source1:        data.tar.xz
 %endif
 
-# Remove bundled libraries
-Patch0:         openjpeg2_remove-thirdparty.patch
 # Rename tool names to avoid conflicts with openjpeg-1.x
-Patch1:         openjpeg2_opj2.patch
+Patch0:         openjpeg2_opj2.patch
 
 
 BuildRequires:  cmake
@@ -204,7 +202,7 @@ OpenJPEG2 JP3D module command line tools
 %autosetup -p1 -n openjpeg-%{version} %{?runcheck:-a 1}
 
 # Remove all third party libraries just to be sure
-rm -rf thirdparty
+find thirdparty/ -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \;
 
 
 %build
@@ -327,6 +325,9 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Wed Oct 02 2019 Sandro Mani <manisandro@gmail.com> - 2.3.1-3
+- Fix unbundling 3rd party libraries (#1757822)
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

openjpeg2_remove-thirdparty.patch

@@ -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)