- added irrxml patch, use system irrxml

- added pc patch (normalize includedir,libdir paths in .pc file)
- release 2

diff --git a/assimp-irrxml.patch b/assimp-irrxml.patch
new file mode 100644 (file)
index 0000000..2bfa2d0
--- /dev/null
+++ b/assimp-irrxml.patch
@@ -0,0 +1,11 @@
+--- assimp-5.0.1/cmake-modules/FindIrrXML.cmake.orig   2020-01-12 12:56:40.000000000 +0100
++++ assimp-5.0.1/cmake-modules/FindIrrXML.cmake        2020-12-25 13:21:58.767549238 +0100
+@@ -7,7 +7,7 @@
+ #   IRRXML_LIBRARY        - IrrXML main library
+ 
+ find_path(IRRXML_INCLUDE_DIR irrXML.h
+-    PATH_SUFFIXES include/irrlicht include/irrxml)
++    PATH_SUFFIXES include/irrxml)
+ find_library(IRRXML_LIBRARY IrrXML)
+ 
+ include(FindPackageHandleStandardArgs)

diff --git a/assimp-pc.patch b/assimp-pc.patch
new file mode 100644 (file)
index 0000000..3713883
--- /dev/null
+++ b/assimp-pc.patch
@@ -0,0 +1,13 @@
+--- assimp-5.0.1/assimp.pc.in.orig     2020-01-12 12:56:40.000000000 +0100
++++ assimp-5.0.1/assimp.pc.in  2020-12-25 13:23:56.546911173 +0100
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@/
+-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Import various well-known 3D model formats in an uniform manner.

diff --git a/assimp.spec b/assimp.spec
index 3f4128598a19bc5e62fdb4256e74ddc680214e18..594aaa299d967e77958d3820bfa77bdf9754844f 100644 (file)
--- a/assimp.spec
+++ b/assimp.spec
@@ -2,13 +2,16 @@ Summary:      Open Asset Import Library
 Summary(pl.UTF-8):     Asset Import - otwarta biblioteka do importu danych trójwymiarowych
 Name:          assimp
 Version:       5.0.1
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/assimp/assimp/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: eb7b7385a5c3194ab46d7f869d7ac6cf
+Patch0:                %{name}-irrxml.patch
+Patch1:                %{name}-pc.patch
 URL:           https://www.assimp.org/
-BuildRequires: cmake >= 2.6
+BuildRequires: cmake >= 3.0
+BuildRequires: irrxml-devel
 BuildRequires: libstdc++-devel
 BuildRequires: minizip-devel
 BuildRequires: pkgconfig
@@ -35,6 +38,8 @@ Summary:      Header files for assimp library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki assimp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel
+Requires:      zlib-devel
 
 %description devel
 The header files needed for development of programs using the assimp
@@ -46,17 +51,21 @@ bibliotekę assimp.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
-       -DASSIMP_LIB_INSTALL_DIR:PATH=%{_lib}
+       -DASSIMP_LIB_INSTALL_DIR:PATH=%{_lib} \
+       -DSYSTEM_IRRXML=ON
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT