Hello community, here is the log from the commit of package lib3ds checked in at Mon Jun 4 00:23:06 CEST 2007. -------- --- lib3ds/lib3ds.changes 2006-08-31 17:13:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/lib3ds/lib3ds.changes 2007-05-30 18:53:50.705026000 +0200 @@ -1,0 +2,12 @@ +Wed May 30 18:26:54 CEST 2007 - pth@suse.de + +- Suppress "devel file in non-devel package" error. lib3ds only + provides a static library and headers. +- Don't compile examples, let the user do that himself if needed. +- Provide CONFIGURE_GLUT in acinclude.m4 in order to make it + possible to run autoreconf. Remove unnecessary acconfig.h. +- modify lib3ds-no_type_punning.patch to more resemble upstream + fix. +- (Build)Require Mesa-devel and freeglut-devel + +------------------------------------------------------------------- New: ---- acinclude.m4 lib3ds-no_compiled_examples.patch rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lib3ds.spec ++++++ --- /var/tmp/diff_new_pack.Y10244/_old 2007-06-04 00:22:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y10244/_new 2007-06-04 00:22:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lib3ds (Version 1.2.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,15 +11,19 @@ # norootforbuild Name: lib3ds +Requires: Mesa-devel freeglut-devel +BuildRequires: Mesa-devel freeglut-devel URL: http://lib3ds.sourceforge.net -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/C and C++ Summary: Import and Export of Autodesk 3DS Files Version: 1.2.0 -Release: 171 +Release: 206 Source0: %name-%version.tar.bz2 +Source1: acinclude.m4 Patch0: lib3ds-fix_quoting.patch Patch1: lib3ds-no_type_punning.patch +Patch2: lib3ds-no_compiled_examples.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,17 +41,18 @@ %setup -q %patch0 %patch1 +%patch2 +cp %{S:1} . +rm -f acconfig.h %build +autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS" -./configure \ - --prefix=/usr \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} +%configure make %install -rm -rf $RPM_BUILD_ROOT +rm -rf examples/.deps make DESTDIR=$RPM_BUILD_ROOT install %files @@ -61,7 +66,16 @@ /usr/share/aclocal/lib3ds.m4 /%_mandir/man1/*gz -%changelog -n lib3ds +%changelog +* Wed May 30 2007 - pth@suse.de +- Suppress "devel file in non-devel package" error. lib3ds only + provides a static library and headers. +- Don't compile examples, let the user do that himself if needed. +- Provide CONFIGURE_GLUT in acinclude.m4 in order to make it + possible to run autoreconf. Remove unnecessary acconfig.h. +- modify lib3ds-no_type_punning.patch to more resemble upstream + fix. +- (Build)Require Mesa-devel and freeglut-devel * Thu Aug 31 2006 - pth@suse.de - Fix quoting in definition of AM_PATH_LIB3DS. - Fix type punning to compile with strict-aliasing. ++++++ lib3ds-no_compiled_examples.patch ++++++ --- Makefile.am +++ Makefile.am @@ -20,7 +20,7 @@ # $Id: Makefile.am,v 1.18 2001/07/18 12:17:49 jeh Exp $ # -SUBDIRS = msvc lib3ds tools examples +SUBDIRS = msvc lib3ds tools bin_SCRIPTS = lib3ds-config ++++++ lib3ds-no_type_punning.patch ++++++ --- /var/tmp/diff_new_pack.Y10244/_old 2007-06-04 00:22:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Y10244/_new 2007-06-04 00:22:55.000000000 +0200 @@ -1,11 +1,18 @@ --- lib3ds/io.c +++ lib3ds/io.c -@@ -248,15 +248,15 @@ +@@ -244,19 +244,22 @@ + * + * Read a float from a file stream in little endian format. + */ ++ ++typedef union {Lib3dsDword dwval; Lib3dsFloat fval;}f_and_dw; ++ + Lib3dsFloat lib3ds_io_read_float(Lib3dsIo *io) { Lib3dsByte b[4]; - Lib3dsDword d; -+ union{Lib3dsDword w; Lib3dsFloat f;}d; ++ f_and_dw d; ASSERT(io); lib3ds_io_read(io, b, 4); @@ -14,20 +21,20 @@ - ((Lib3dsDword)b[1] << 8) | - ((Lib3dsDword)b[0]); - return(*((Lib3dsFloat*)&d)); -+ d.w = ((Lib3dsDword)b[3] << 24) | -+ ((Lib3dsDword)b[2] << 16) | -+ ((Lib3dsDword)b[1] << 8) | -+ ((Lib3dsDword)b[0]); -+ return d.f; ++ d.dwval = ((Lib3dsDword)b[3] << 24) | ++ ((Lib3dsDword)b[2] << 16) | ++ ((Lib3dsDword)b[1] << 8) | ++ ((Lib3dsDword)b[0]); ++ return d.fval; } -@@ -459,14 +459,14 @@ +@@ -459,14 +462,14 @@ lib3ds_io_write_float(Lib3dsIo *io, Lib3dsFloat l) { Lib3dsByte b[4]; - Lib3dsDword d; -+ union{Lib3dsDword w; Lib3dsFloat f;}d; ++ f_and_dw d; ASSERT(io); - d=*((Lib3dsDword*)&l); @@ -35,11 +42,11 @@ - b[2]=(Lib3dsByte)(((Lib3dsDword)d & 0x00FF0000) >> 16); - b[1]=(Lib3dsByte)(((Lib3dsDword)d & 0x0000FF00) >> 8); - b[0]=(Lib3dsByte)(((Lib3dsDword)d & 0x000000FF)); -+ d.f=l; -+ b[3]=(Lib3dsByte)((d.w & 0xFF000000) >> 24); -+ b[2]=(Lib3dsByte)((d.w & 0x00FF0000) >> 16); -+ b[1]=(Lib3dsByte)((d.w & 0x0000FF00) >> 8); -+ b[0]=(Lib3dsByte)((d.w & 0x000000FF)); ++ d.fval=l; ++ b[3]=(Lib3dsByte)((d.dwval & 0xFF000000) >> 24); ++ b[2]=(Lib3dsByte)((d.dwval & 0x00FF0000) >> 16); ++ b[1]=(Lib3dsByte)((d.dwval & 0x0000FF00) >> 8); ++ b[0]=(Lib3dsByte)((d.dwval & 0x000000FF)); if (lib3ds_io_write(io, b, 4)!=4) { return(LIB3DS_FALSE); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org