diff --git a/collada-dom.include-zlib.patch b/collada-dom.include-zlib.patch new file mode 100644 index 0000000..b523e7f --- /dev/null +++ b/collada-dom.include-zlib.patch @@ -0,0 +1,12 @@ +diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +index 4536275..b494f6b 100644 +--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp ++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +@@ -33,6 +33,7 @@ + using namespace std; + + #include // for saving compressed files ++#include + #ifdef _WIN32 + #include + #else diff --git a/collada-dom.spec b/collada-dom.spec index 27ed99f..cc4e806 100644 --- a/collada-dom.spec +++ b/collada-dom.spec @@ -1,15 +1,22 @@ Name: collada-dom Version: 2.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: COLLADA Document Object Model Library License: MIT URL: http://www.collada.org Source0: https://github.com/rdiankov/collada-dom/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: collada-dom.include-zlib.patch -BuildRequires: cmake, gcc-c++, dos2unix -BuildRequires: minizip-compat-devel, zlib-devel, boost-devel, libxml2-devel, pcre-devel +BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: dos2unix +BuildRequires: gcc-c++ +BuildRequires: libxml2-devel +BuildRequires: minizip-devel +BuildRequires: pcre-devel +BuildRequires: zlib-devel %description COLLADA is a royalty-free XML schema that enables digital asset exchange @@ -29,7 +36,7 @@ developing applications that use %{name}. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} rm -rf dom/external-libs dos2unix README.rst dos2unix licenses/dom_license_e.txt @@ -64,6 +71,9 @@ mv $RPM_BUILD_ROOT%{_libdir}/cmake/collada_dom-* $RPM_BUILD_ROOT%{_libdir}/cmake %changelog +* Sat Feb 23 2019 Till Hofmann - 2.5.0-8 +- Remove dependency on minizip-compat (#1632171) + * Thu Jan 31 2019 Fedora Release Engineering - 2.5.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild