commit lib3ds for openSUSE:Factory

Hello community, here is the log from the commit of package lib3ds for openSUSE:Factory checked in at 2014-08-08 10:10:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lib3ds (Old) and /work/SRC/openSUSE:Factory/.lib3ds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lib3ds" Changes: -------- --- /work/SRC/openSUSE:Factory/lib3ds/lib3ds.changes 2013-01-12 14:51:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lib3ds.new/lib3ds.changes 2014-08-08 10:13:43.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 4 16:43:01 UTC 2014 - tchvatal@suse.com + +- Add pkgconfig patch to match Fedora behaviour: + * lib3ds-pkgconfig.patch +- Format with spec-cleaner. +- Remove Obsoletes from openSUSE-10.2 +- Add patch to fix potential CVE-2010-0280: + * lib3ds-mesh.c.patch + +------------------------------------------------------------------- New: ---- lib3ds-mesh.c.patch lib3ds-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lib3ds.spec ++++++ --- /var/tmp/diff_new_pack.Vn2IDa/_old 2014-08-08 10:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Vn2IDa/_new 2014-08-08 10:13:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lib3ds # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,32 +16,33 @@ # +%define libname %{name}-1-3 Name: lib3ds -Url: http://lib3ds.sourceforge.net +Version: 1.3.0 +Release: 0 Summary: Import and Export of Autodesk 3DS Files License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Version: 1.3.0 -Release: 0 -Source0: %name-%version.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://lib3ds.sourceforge.net +Source0: %{name}-%{version}.tar.bz2 +Patch0: lib3ds-pkgconfig.patch +Patch1: lib3ds-mesh.c.patch BuildRequires: Mesa-devel BuildRequires: freeglut-devel BuildRequires: libtool +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Lib3ds is a free alternative to Autodesk's 3DS File Toolkit for handling 3DS files. Its main goal is to simplify the creation of 3DS import and export filters. -%package -n lib3ds-1-3 +%package -n %{libname} Summary: Import and Export of Autodesk 3DS Files Group: Development/Libraries/C and C++ Provides: %{name} = %{version} -#opensuse 10.2 -Obsoletes: %{name} <= 1.2.0 -%description -n lib3ds-1-3 +%description -n %{libname} Lib3ds is a free alternative to Autodesk's 3DS File Toolkit for handling 3DS files. Its main goal is to simplify the creation of 3DS import and export filters. @@ -49,8 +50,8 @@ %package devel Summary: Import and Export of Autodesk 3DS Files Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version} Requires: glibc-devel -Requires: lib3ds-1-3 = %{version} %description devel Lib3ds is a free alternative to Autodesk's 3DS File Toolkit for @@ -59,22 +60,27 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build -autoreconf -fi -export CFLAGS="$RPM_OPT_FLAGS" -%configure --enable-shared --disable-static --with-pic +autoreconf -fvi +export CFLAGS="%{optflags}" +%configure \ + --enable-shared \ + --disable-static \ + --with-pic make %{?_smp_mflags} %install -%{__rm} -rf examples/.deps -%{__make} DESTDIR=$RPM_BUILD_ROOT install -%{__rm} -f %{buildroot}%{_libdir}/*.la +rm -rf examples/.deps +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %check -%{__make} check +make check %{?_smp_mflags} -%files -n lib3ds-1-3 +%files -n %{libname} %defattr(-,root,root) %{_libdir}/lib3ds-1.so.3* @@ -89,8 +95,8 @@ %{_libdir}/lib3ds.so %{_datadir}/aclocal/lib3ds.m4 -%post -n lib3ds-1-3 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n lib3ds-1-3 -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %changelog ++++++ lib3ds-mesh.c.patch ++++++ diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c --- lib3ds-1.3.0.orig/lib3ds/mesh.c 2007-06-20 19:04:08.000000000 +0200 +++ lib3ds-1.3.0/lib3ds/mesh.c 2010-09-14 06:34:39.987807911 +0200 @@ -87,8 +87,11 @@ faces=lib3ds_io_read_word(io); for (i=0; ifaceL[index].material, name); + if (index<mesh->faces) { + strncpy(mesh->faceL[index].material, name, 64); + } else { + // TODO warning + } } } break; ++++++ lib3ds-pkgconfig.patch ++++++ diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in --- lib3ds-1.2.0.orig/lib3ds-config.in 2000-05-23 14:13:08.000000000 +0200 +++ lib3ds-1.2.0/lib3ds-config.in 2007-10-21 06:37:48.000000000 +0200 @@ -1,9 +1,5 @@ #!/bin/sh -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - usage() { cat <&2 fi +PKG_CONFIG_ARGS= + while test $# -gt 0; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; @@ -30,23 +28,23 @@ case $1 in --prefix=*) - prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg" if test $exec_prefix_set = no ; then - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" fi ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" exec_prefix_set=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) - echo @LIB3DS_VERSION@ + pkg-config --modversion lib3ds ;; --cflags) echo_cflags=yes @@ -62,23 +60,18 @@ done if test "$echo_prefix" = "yes"; then - echo $prefix + pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds fi if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix + pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds fi if test "$echo_cflags" = "yes"; then - if test @includedir@ != /usr/include ; then - echo -I@includedir@ - fi + pkg-config $PKG_CONFIG_ARGS --cflags lib3ds fi if test "$echo_libs" = "yes"; then - if test @libdir@ != /usr/lib ; then - my_linker_flags="-L@libdir@" - fi - echo ${my_linker_flags} -l3ds -fi + pkg-config $PKG_CONFIG_ARGS --libs lib3ds +fi diff -uNr lib3ds-1.2.0.orig/lib3ds.pc.in lib3ds-1.2.0/lib3ds.pc.in --- lib3ds-1.2.0.orig/lib3ds.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ lib3ds-1.2.0/lib3ds.pc.in 2007-10-21 06:23:53.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: lib3ds +Description: lib3ds +Version: @VERSION@ +Requires: +Libs: -L${libdir} -l3ds -lm +Cflags: -I${includedir} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org