From 86601cd4a487e692280c3fe317bbdd632199ca7c3a4e802064a9f154b79cb1cf Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 4 May 2017 14:08:57 +0000 Subject: [PATCH] Accepting request 491645 from home:jengelh:branches:games remove entire models-nonbsd tree OBS-URL: https://build.opensuse.org/request/show/491645 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=5 --- assimp-3.3.1-suse.tar.gz | 3 +++ assimp-3.3.1.tar.gz | 3 --- assimp.changes | 7 +++++++ assimp.spec | 20 +++++++++++--------- sanitize_source.sh | 7 +++++++ 5 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 assimp-3.3.1-suse.tar.gz delete mode 100644 assimp-3.3.1.tar.gz create mode 100644 sanitize_source.sh diff --git a/assimp-3.3.1-suse.tar.gz b/assimp-3.3.1-suse.tar.gz new file mode 100644 index 0000000..aaa57a8 --- /dev/null +++ b/assimp-3.3.1-suse.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40b7d298ceb976409fc4e8456331f728a4f4406355b731120eac80abee42e877 +size 27302594 diff --git a/assimp-3.3.1.tar.gz b/assimp-3.3.1.tar.gz deleted file mode 100644 index 729d85e..0000000 --- a/assimp-3.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf -size 36428380 diff --git a/assimp.changes b/assimp.changes index f03321c..2b2d5c5 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 20 11:05:53 UTC 2017 - jengelh@inai.de + +- Rename %soname to %sover to better reflects its use. +- Repackage original tarball with the test/models-nonbsd/ + directory removed. + ------------------------------------------------------------------- Mon Sep 5 10:38:19 UTC 2016 - rpm@fthiessen.de diff --git a/assimp.spec b/assimp.spec index cc24442..e154ac7 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ # # spec file for package assimp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define soname 3 +%define sover 3 Name: assimp Version: 3.3.1 Release: 0 @@ -24,7 +24,9 @@ Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://assimp.org/ -Source: https://github.com/assimp/assimp/archive/v%{version}/%{name}-%{version}.tar.gz +#Source: https://github.com/assimp/assimp/archive/v%{version}/%{name}-%{version}.tar.gz +Source: %{name}-%{version}-suse.tar.gz +Source9: sanitize_source.sh BuildRequires: boost-devel BuildRequires: cmake BuildRequires: dos2unix @@ -36,18 +38,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. -%package -n lib%{name}%{soname} +%package -n lib%{name}%{sover} Summary: Headers, docs and command-line utility for %{name} Group: System/Libraries -%description -n lib%{name}%{soname} +%description -n lib%{name}%{sover} Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. %package devel Summary: Headers, docs and command-line utility for %{name} Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: lib%{name}%{soname} = %{version} +Requires: lib%{name}%{sover} = %{version} Requires: libstdc++-devel %description devel @@ -70,10 +72,10 @@ rm -rf examples/.deps %cmake_install find %{buildroot} -type f -name "*.la" -delete -print -%post -n lib%{name}%{soname} -p /sbin/ldconfig -%postun -n lib%{name}%{soname} -p /sbin/ldconfig +%post -n lib%{name}%{sover} -p /sbin/ldconfig +%postun -n lib%{name}%{sover} -p /sbin/ldconfig -%files -n lib%{name}%{soname} +%files -n lib%{name}%{sover} %defattr(-,root,root) %if 0%{?suse_version} > 1320 %license CREDITS LICENSE diff --git a/sanitize_source.sh b/sanitize_source.sh new file mode 100644 index 0000000..050efff --- /dev/null +++ b/sanitize_source.sh @@ -0,0 +1,7 @@ +#!/bin/sh +p="assimp-3.3.1" +wget -c "https://github.com/assimp/assimp/archive/v3.3.1/$p.tar.gz" +rm -Rf "$p" +tar -xf "$p.tar.gz" +rm -Rf "$p/test/models-nonbsd" +tar --owner=root --group=root -czf "$p-suse.tar.gz" "$p"