From 8482203cf0857697d1cbfa2301b2005bc0620271 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Oct 02 2017 22:12:22 +0000 Subject: Cleanup spec file conditionals --- diff --git a/assimp.spec b/assimp.spec index e8b1943..4b0db48 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,6 +1,6 @@ Name: assimp Version: 3.3.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Library to import various 3D model formats into applications Group: Development/Libraries # Assimp is BSD, the bundled openddlparser is MIT. @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(minizip) #BuildRequires: pkgconfig(polyclipping) Provides: bundled(polyclipping) = 4.8.8 BuildRequires: pkgconfig(python2) -%if 0%{?fedora} > 23 +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: pkgconfig(ILUT) BuildRequires: pkgconfig(python3) %endif @@ -82,7 +82,7 @@ Obsoletes: %{name}-python < 3.1.1 %description -n python2-%{name} This package contains the PyAssimp python bindings -%if 0%{?fedora} > 23 +%if 0%{?fedora} || 0%{?rhel} > 7 %package -n python3-%{name} Summary: Python 3 bindings for assimp Group: Development/Libraries @@ -151,7 +151,7 @@ rm -rf %{buildroot} make -C build install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{python2_sitelib}/pyassimp/ install -m0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python2_sitelib}/pyassimp/ -%if 0%{?fedora} > 23 +%if 0%{?fedora} || 0%{?rhel} > 7 mkdir -p %{buildroot}%{python3_sitelib}/pyassimp/ install -m0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyassimp/ %endif @@ -179,13 +179,16 @@ install -m0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyassi %doc port/PyAssimp/README.md %{python_sitelib}/pyassimp -%if 0%{?fedora} > 23 +%if 0%{?fedora} || 0%{?rhel} > 7 %files -n python3-%{name} %doc port/PyAssimp/README.md %{python3_sitelib}/pyassimp %endif %changelog +* Mon Oct 02 2017 Troy Dawson - 3.3.1-13 +- Cleanup spec file conditionals + * Sun Aug 06 2017 Björn Esser - 3.3.1-12 - Rebuilt for AutoReq cmake-filesystem