From 8b2dc9d9b4c70eeee00b9ec6f496bdcabcd306f4 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: May 18 2017 05:31:03 +0000 Subject: - Fix pkgconfig invalid directories - Bug 1451859 --- diff --git a/assimp-3.3.1-install-pkgconfig.patch b/assimp-3.3.1-install-pkgconfig.patch new file mode 100644 index 0000000..6a45f68 --- /dev/null +++ b/assimp-3.3.1-install-pkgconfig.patch @@ -0,0 +1,13 @@ +--- assimp-3.3.1/assimp.pc.in.fedora 2017-05-18 07:19:36.251314963 +0200 ++++ assimp-3.3.1/assimp.pc.in 2017-05-18 07:20:26.038525493 +0200 +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@/@ASSIMP_BIN_INSTALL_DIR@ +-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_INCLUDE_INSTALL_DIR@/assimp ++exec_prefix=@ASSIMP_BIN_INSTALL_DIR@ ++libdir=@ASSIMP_LIB_INSTALL_DIR@ ++includedir=@ASSIMP_INCLUDE_INSTALL_DIR@/assimp + + 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 4e8fdc6..4df3a5c 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,6 +1,6 @@ Name: assimp Version: 3.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to import various 3D model formats into applications Group: Development/Libraries # Assimp is BSD, the bundled openddlparser is MIT. @@ -21,6 +21,7 @@ Patch1: %{name}-3.2.0-pythonpath.patch Patch2: 0001-Assimp-cmake-provider-fix.patch # fix FTBFS on bigendian platform s390x/ppc64 Patch3: assimp-3.3.1-namespace-bigendian.patch +Patch10: assimp-3.3.1-install-pkgconfig.patch #Upstream backports # Collada morph animation Patch100: 0001-Morph-animation-support-for-collada.patch @@ -114,6 +115,8 @@ rm -r contrib/poly2tri %patch1 -p1 -b .pythonpath %patch2 -p1 -b .cmakefix %patch3 -p1 -b .bigendian +# Need to be upstreamed +%patch10 -p1 -b .pkgconfig # Backported from upstream %patch100 -p1 -b .docfix %patch101 -p1 -b .qt3d @@ -183,6 +186,9 @@ install -m0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyassi %endif %changelog +* Thu May 18 2017 Helio Chissini de Castro - 3.3.1-8 +- Fix invalid pkgconfig generation + * Mon May 15 2017 Fedora Release Engineering - 3.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild