[packages/lib3ds] - updated to 1.3.0 - removed obsolete am18,shared patches (upstream shared library has new soname)
qboosh
qboosh at pld-linux.org
Wed Dec 30 22:37:38 CET 2020
commit 3cb0ec446b006b8183ca56068e39bf72c515eef9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Dec 30 22:37:20 2020 +0100
- updated to 1.3.0
- removed obsolete am18,shared patches (upstream shared library has new soname)
lib3ds-am18.patch | 11 ----------
lib3ds-shared.patch | 62 -----------------------------------------------------
lib3ds.spec | 34 +++++++++++------------------
3 files changed, 13 insertions(+), 94 deletions(-)
---
diff --git a/lib3ds.spec b/lib3ds.spec
index a91371f..51d5b50 100644
--- a/lib3ds.spec
+++ b/lib3ds.spec
@@ -1,21 +1,19 @@
#
# Conditional build:
-%bcond_without static_libs # don't build static library
+%bcond_without static_libs # static library
#
Summary: The 3D Studio File Format Library
Summary(pl.UTF-8): Biblioteka obsługująca format plików 3D Studio
Name: lib3ds
-Version: 1.2.0
-Release: 2
-License: LGPL
+Version: 1.3.0
+Release: 1
+License: LGPL v2.1+
Group: Libraries
-Source0: http://dl.sourceforge.net/lib3ds/%{name}-%{version}.tar.gz
-# Source0-md5: 3a7f891d18af0151876b98bc05d3b373
-Patch0: %{name}-shared.patch
-Patch1: %{name}-am18.patch
+Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/lib3ds/%{name}-%{version}.zip
+# Source0-md5: 2572f7b0f29b591d494c1a0658b35c86
URL: http://lib3ds.sourceforge.net/
BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: automake >= 1.4
BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,11 +60,6 @@ Statyczna biblioteka lib3ds.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
-# extract CONFIGURE_GLUT macro
-tail -n 116 aclocal.m4 | head -n 102 > acinclude.m4
%build
%{__libtoolize}
@@ -86,9 +79,7 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-sed -e 's/@GLUT_HEADER_DIR@/GL/' examples/glstub.h.in \
- >$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/glstub.h
+cp -p examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,9 +90,10 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_bindir}/3ds*
-%attr(755,root,root) %{_libdir}/lib3ds.so.*.*
-%{_mandir}/man1/3ds*.1*
+%attr(755,root,root) %{_bindir}/3dsdump
+%attr(755,root,root) %{_libdir}/lib3ds-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib3ds-1.so.3
+%{_mandir}/man1/3dsdump.1*
%files devel
%defattr(644,root,root,755)
@@ -109,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/lib3ds.so
%{_libdir}/lib3ds.la
%{_includedir}/lib3ds
-%{_aclocaldir}/*.m4
+%{_aclocaldir}/lib3ds.m4
%{_mandir}/man1/lib3ds-config.1*
%{_examplesdir}/%{name}-%{version}
diff --git a/lib3ds-am18.patch b/lib3ds-am18.patch
deleted file mode 100644
index 9c6daed..0000000
--- a/lib3ds-am18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib3ds-1.2.0/lib3ds.m4.orig 2000-07-16 01:14:59.000000000 +0200
-+++ lib3ds-1.2.0/lib3ds.m4 2003-12-28 15:41:51.999237408 +0100
-@@ -1,7 +1,7 @@
- dnl
- dnl AM_PATH_LIB3DS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl
--AC_DEFUN(AM_PATH_LIB3DS,
-+AC_DEFUN([AM_PATH_LIB3DS],
- [
-
- AC_ARG_WITH(lib3ds-prefix,[ --with-lib3ds-prefix=PFX Prefix where lib3ds is installed (optional)],
diff --git a/lib3ds-shared.patch b/lib3ds-shared.patch
deleted file mode 100644
index 83227a3..0000000
--- a/lib3ds-shared.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib3ds-1.2.0/configure.in.orig Mon Jan 14 13:09:15 2002
-+++ lib3ds-1.2.0/configure.in Mon Mar 24 20:11:14 2003
-@@ -38,7 +38,7 @@
-
- dnl Checks for programs.
- AC_PROG_CC
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- CONFIGURE_GLUT(,)
-
- AC_MSG_CHECKING([for debugging mode])
---- lib3ds-1.2.0/lib3ds/Makefile.am.orig Mon Jan 14 13:27:45 2002
-+++ lib3ds-1.2.0/lib3ds/Makefile.am Mon Mar 24 20:10:12 2003
-@@ -24,9 +24,9 @@
-
- INCLUDES = -I$(top_srcdir)
-
--lib_LIBRARIES = lib3ds.a
-+lib_LTLIBRARIES = lib3ds.la
-
--lib3ds_a_SOURCES = \
-+lib3ds_la_SOURCES = \
- io.c \
- float.c \
- vector.c \
-@@ -48,6 +48,8 @@
- tracks.c \
- node.c
-
-+lib3ds_la_LIBADD = -lm
-+
- lib3ds_HEADERS = \
- types.h \
- io.h \
---- lib3ds-1.2.0/examples/Makefile.am.orig Mon Jan 14 13:27:45 2002
-+++ lib3ds-1.2.0/examples/Makefile.am Mon Mar 24 20:10:47 2003
-@@ -36,12 +36,12 @@
- $(PLAYER)
-
- LDADD = \
-- $(top_builddir)/lib3ds/lib3ds.a \
-+ $(top_builddir)/lib3ds/lib3ds.la \
- @DMALLOC_LIBS@ -lm
-
- player_SOURCES = player.c
- player_LDADD = \
-- $(top_builddir)/lib3ds/lib3ds.a \
-+ $(top_builddir)/lib3ds/lib3ds.la \
- @GLUT_LIBS@ \
- @DMALLOC_LIBS@ -lm
-
---- lib3ds-1.2.0/tools/Makefile.am.orig Mon Jan 14 13:27:45 2002
-+++ lib3ds-1.2.0/tools/Makefile.am Mon Mar 24 20:22:08 2003
-@@ -29,7 +29,7 @@
- 3ds2m
-
- LDADD = \
-- $(top_builddir)/lib3ds/lib3ds.a \
-+ $(top_builddir)/lib3ds/lib3ds.la \
- @DMALLOC_LIBS@ -lm
-
- MANPAGES = \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lib3ds.git/commitdiff/3cb0ec446b006b8183ca56068e39bf72c515eef9
More information about the pld-cvs-commit
mailing list