commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2018-05-17 18:03:27
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Thu May 17 18:03:27 2018 rev:36 rq:604726 version:0.2.8.4
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2018-03-20
21:51:40.460446744 +0100
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2018-05-17
18:03:32.611994833 +0200
@@ -1,0 +2,7 @@
+Fri May 4 08:43:30 UTC 2018 - idon...@suse.com
+
+- Add use-pkg-config-for-freetype.patch to use pkgconfig to detect
+ Freetype libraries. Add BR autoconf, automake, libtool due to
+ above.
+
+---
New:
use-pkg-config-for-freetype.patch
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.aR92Bo/_old 2018-05-17 18:03:36.023870048 +0200
+++ /var/tmp/diff_new_pack.aR92Bo/_new 2018-05-17 18:03:36.027869901 +0200
@@ -37,10 +37,14 @@
Patch8: libwmf-0.2.8.4-CVE-2015-4696.patch
Patch9: libwmf-0.2.8.4-CVE-2015-4695.patch
Patch10:reproducible.patch
+Patch11:use-pkg-config-for-freetype.patch
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: gd-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
+BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-proto-devel
@@ -114,8 +118,11 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%build
+# Patch11 modifies configure.ac
+autoreconf -fi
%configure --disable-static --prefix=%{_prefix} $RPM_ARCH-suse-linux
--enable-magick --libdir=%{_libdir}
make %{?_smp_mflags}
++ use-pkg-config-for-freetype.patch ++
Index: libwmf-0.2.8.4/configure.ac
===
--- libwmf-0.2.8.4.orig/configure.ac
+++ libwmf-0.2.8.4/configure.ac
@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=
fi
])
-if [ test -n "$FREETYPE_DIR" ]; then
- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config,
,[$FREETYPE_DIR/bin:$PATH])
-else
- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
-fi
-
-if [ test -n "$FREETYPE_CONFIG" ]; then
- if [ test -n "$FREETYPE_DIR" ]; then
- freetype_cflags="`$FREETYPE_CONFIG --cflags`
-I$FREETYPE_DIR/include"
- freetype_libs=`$FREETYPE_CONFIG --libs`
- else
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
- freetype_libs=`$FREETYPE_CONFIG --libs`
- fi
-else
- if [ test -n "$FREETYPE_DIR" ]; then
- freetype_cflags="-I$FREETYPE_DIR/include/freetype2
-I$FREETYPE_DIR/include"
- freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
- else
- freetype_cflags=""
- freetype_libs="-lfreetype"
- fi
-fi
-
-CPPFLAGS="$freetype_cflags $CPPFLAGS"
-LDFLAGS="$LDFLAGS $freetype_libs"
+PKG_CHECK_MODULES(FREETYPE2, freetype2,
+CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
+LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
+AC_MSG_ERROR([*** Unable to find FreeType2 library
(http://www.freetype.org/)])
+)
AC_CHECK_LIB(freetype,FT_Init_FreeType,[
- WMF_FT_LDFLAGS="$freetype_libs"
+ WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
],[AC_MSG_ERROR([* * * freetype(2) is required * * *])
])
AC_CHECK_HEADER(ft2build.h,[
- WMF_FT_CFLAGS="$freetype_cflags"
- WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
+ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
+ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
],[AC_MSG_ERROR([* * * freetype(2) is required * * *])
])
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2018-03-20 21:51:36
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Tue Mar 20 21:51:36 2018 rev:35 rq:586439 version:0.2.8.4
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2018-03-12
12:10:19.474463142 +0100
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2018-03-20
21:51:40.460446744 +0100
@@ -1,0 +2,7 @@
+Tue Mar 13 12:34:22 UTC 2018 - crrodrig...@opensuse.org
+
+- libwmf-0.2.8.4-config.patch: update so -config --libs
+ do not inject bogus dependencies to other packages.
+- build with disable-static too.
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.9Y3iLU/_old 2018-03-20 21:51:41.452411024 +0100
+++ /var/tmp/diff_new_pack.9Y3iLU/_new 2018-03-20 21:51:41.452411024 +0100
@@ -116,7 +116,7 @@
%patch10 -p1
%build
-%configure --prefix=%{_prefix} $RPM_ARCH-suse-linux --enable-magick
--libdir=%{_libdir}
+%configure --disable-static --prefix=%{_prefix} $RPM_ARCH-suse-linux
--enable-magick --libdir=%{_libdir}
make %{?_smp_mflags}
%install
@@ -168,9 +168,7 @@
%{_bindir}/libwmf-config
%{_includedir}/libwmf
%{_libdir}/libwmf*.so
-%{_libdir}/libwmf*.a
%dir %{_libdir}/gtk-*/*/loaders
-%{_libdir}/gtk-*/*/loaders/*.*a
#
%doc %{_defaultdocdir}/libwmf/*.html
%doc %{_defaultdocdir}/libwmf/*.png
++ libwmf-0.2.8.4-config.patch ++
--- /var/tmp/diff_new_pack.9Y3iLU/_old 2018-03-20 21:51:41.516408719 +0100
+++ /var/tmp/diff_new_pack.9Y3iLU/_new 2018-03-20 21:51:41.516408719 +0100
@@ -1,6 +1,17 @@
libwmf-config.in
+Index: libwmf-config.in
+===
+--- libwmf-config.in.orig
+++ libwmf-config.in
-@@ -95,14 +95,14 @@
+@@ -105,7 +105,7 @@ esac
+
+ libwmf_buildstyle=@LIBWMF_BUILDSTYLE@
+ if test $libwmf_buildstyle = heavy; then
+- wmf_libs="-lwmf -lwmflite $wmf_liblflags"
++ wmf_libs="-lwmf -lwmflite -lX11 -lfreetype -lz"
+ else
+ wmf_libs="-lwmflite"
+ fi
+@@ -115,14 +115,14 @@ if test "$echo_cflags" = "yes"; then
if test "$lib_gd" = "yes"; then
includes="$includes -I@includedir@/libwmf/gd"
fi
@@ -17,4 +28,3 @@
my_wmf_libs=
for i in $wmf_libs ; do
if test "x$i" != "x-L@libdir@" ; then
-
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2018-03-12 12:10:18
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Mon Mar 12 12:10:18 2018 rev:34 rq:584528 version:0.2.8.4
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2018-01-30
15:40:31.273480180 +0100
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2018-03-12
12:10:19.474463142 +0100
@@ -1,0 +2,5 @@
+Thu Mar 1 19:15:31 UTC 2018 - crrodrig...@opensuse.org
+
+- Fix -devel package Requires not to still include xorg-x11-devel
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.dQJ0UG/_old 2018-03-12 12:10:21.694383952 +0100
+++ /var/tmp/diff_new_pack.dQJ0UG/_new 2018-03-12 12:10:21.698383810 +0100
@@ -21,7 +21,7 @@
Version:0.2.8.4
Release:0
Summary:Utilities for Displaying and Converting Metafile Images
-License:LGPL-2.1+
+License:LGPL-2.1-or-later
Group: Productivity/Graphics/Other
Url:http://wvWare.sourceforge.net/
Source:
http://downloads.sourceforge.net/project/wvware/%{name}/%{version}/%{name}-%{version}.tar.gz
@@ -80,10 +80,11 @@
Summary:Static libraries, header files and documentation for libwmf
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
-Requires: libjpeg-devel
-Requires: libpng-devel
Requires: libwmf-gnome = %{version}
-Requires: xorg-x11-devel
+Requires: pkgconfig(freetype2)
+Requires: pkgconfig(x11)
+Requires: pkgconfig(xproto)
+Requires: pkgconfig(zlib)
Provides: mswordvd:%{_libexecdir}/libwmf.a
Provides: wv-devel:%{_libexecdir}/libwmf.a
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2018-01-30 15:40:30
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Tue Jan 30 15:40:30 2018 rev:33 rq:570705 version:0.2.8.4
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2017-06-30
18:37:59.986946151 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2018-01-30
15:40:31.273480180 +0100
@@ -1,0 +2,5 @@
+Mon Jan 29 11:57:03 UTC 2018 - sndir...@suse.com
+
+- removed unneeded 'BuildRequires: xorg-x11-util-devel' (bsc#1077489)
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.7wD8cM/_old 2018-01-30 15:40:32.153439098 +0100
+++ /var/tmp/diff_new_pack.7wD8cM/_new 2018-01-30 15:40:32.153439098 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libwmf
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -44,7 +44,6 @@
BuildRequires: libxml2-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-util-devel
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xt)
Provides: mswordvw:%{_bindir}/wmftopng
@@ -58,8 +57,8 @@
%package tools
Summary:Utilities for Displaying and Converting Metafile Images
-Group: Productivity/Graphics/Other
# Prov/Obs added on 2011-11-22 (post openSUSE 12.1)
+Group: Productivity/Graphics/Other
Provides: libwmf = %{version}-%{release}
Provides: wmf-utils = %{version}-%{release}
Obsoletes: libwmf < %{version}-%{release}
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2017-06-30 18:37:58
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Fri Jun 30 18:37:58 2017 rev:32 rq:505755 version:0.2.8.4
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2015-08-03
17:20:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2017-06-30
18:37:59.986946151 +0200
@@ -1,0 +2,5 @@
+Tue Jun 20 05:24:04 UTC 2017 - bwiedem...@suse.com
+
+- Add reproducible.patch to sort input files to make build reproducible
(boo#1041090)
+
+---
New:
reproducible.patch
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.ikChCT/_old 2017-06-30 18:38:00.838826329 +0200
+++ /var/tmp/diff_new_pack.ikChCT/_new 2017-06-30 18:38:00.838826329 +0200
@@ -36,6 +36,7 @@
Patch7: libwmf-0.2.8.4-badrle.patch
Patch8: libwmf-0.2.8.4-CVE-2015-4696.patch
Patch9: libwmf-0.2.8.4-CVE-2015-4695.patch
+Patch10:reproducible.patch
BuildRequires: gd-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
@@ -112,6 +113,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
%configure --prefix=%{_prefix} $RPM_ARCH-suse-linux --enable-magick
--libdir=%{_libdir}
++ reproducible.patch ++
From: Bernhard M. Wiedemann
Subject: sort .o file lists so libwmf.a is built reproducibly
Index: libwmf-0.2.8.4/ltmain.sh
===
--- libwmf-0.2.8.4.orig/ltmain.sh
+++ libwmf-0.2.8.4/ltmain.sh
@@ -3734,7 +3734,7 @@ EOF
done
fi
- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name
\*.lo -print | $NL2SP`
+ libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name
\*.lo -print | sort | $NL2SP`
done
fi
fi
@@ -4032,7 +4032,7 @@ EOF
done
fi
- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print
-o -name \*.lo -print | $NL2SP`
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print
-o -name \*.lo -print | sort | $NL2SP`
done
fi
fi
@@ -5048,7 +5048,7 @@ fi\
done
fi
- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name
\*.lo -print | $NL2SP`
+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name
\*.lo -print | sort | $NL2SP`
done
fi
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2015-08-03 17:20:44
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2015-06-24
20:32:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2015-08-03
17:20:46.0 +0200
@@ -1,0 +2,10 @@
+Tue Jun 30 08:51:41 UTC 2015 - fst...@suse.com
+
+- Added patches:
+ * libwmf-0.2.8.4-CVE-2015-4695.patch
+- Fix CVE-2015-4695: meta_pen_create heap buffer over read
+ (bsc#936058)
+ * libwmf-0.2.8.4-CVE-2015-4696.patch
+- Fix CVE-2015-4696: wmf2gd/wmf2eps use after free (bsc#936062)
+
+---
@@ -13 +23 @@
-Tue Aug 26 11:59:16 UTC 2014 - nadvor...@suse.com
+Wed Aug 20 13:09:41 UTC 2014 - nadvor...@suse.com
New:
libwmf-0.2.8.4-CVE-2015-4695.patch
libwmf-0.2.8.4-CVE-2015-4696.patch
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.VDbgrv/_old 2015-08-03 17:20:47.0 +0200
+++ /var/tmp/diff_new_pack.VDbgrv/_new 2015-08-03 17:20:47.0 +0200
@@ -34,6 +34,8 @@
Patch5: libwmf-0.2.8.4-bnc495842.patch
Patch6: libwmf-0.2.8.4-CVE-2015-0848.patch
Patch7: libwmf-0.2.8.4-badrle.patch
+Patch8: libwmf-0.2.8.4-CVE-2015-4696.patch
+Patch9: libwmf-0.2.8.4-CVE-2015-4695.patch
BuildRequires: gd-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
@@ -108,6 +110,8 @@
%patch5
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%build
%configure --prefix=%{_prefix} $RPM_ARCH-suse-linux --enable-magick
--libdir=%{_libdir}
++ libwmf-0.2.8.4-CVE-2015-4695.patch ++
Index: libwmf-0.2.8.4/src/player/meta.h
===
--- libwmf-0.2.8.4.orig/src/player/meta.h
+++ libwmf-0.2.8.4/src/player/meta.h
@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
objects = P->objects;
i = 0;
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
if (i == NUM_OBJECTS (API))
{ WMF_ERROR (API,"Object out of range!");
@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
objects = P->objects;
i = 0;
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
if (i == NUM_OBJECTS (API))
{ WMF_ERROR (API,"Object out of range!");
@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API,
objects = P->objects;
i = 0;
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
if (i == NUM_OBJECTS (API))
{ WMF_ERROR (API,"Object out of range!");
@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP
objects = P->objects;
i = 0;
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
if (i == NUM_OBJECTS (API))
{ WMF_ERROR (API,"Object out of range!");
@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API
objects = P->objects;
i = 0;
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
if (i == NUM_OBJECTS (API))
{ WMF_ERROR (API,"Object out of range!");
@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI*
objects = P->objects;
i = 0;
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
if (i == NUM_OBJECTS (API))
{ WMF_ERROR (API,"Object out of range!");
++ libwmf-0.2.8.4-CVE-2015-4696.patch ++
--- libwmf-0.2.8.4/src/player/meta.h
+++ libwmf-0.2.8.4/src/player/meta.h
+ if (FR->region_clip) FR->region_clip (API,&polyrect);
+
wmf_free (API,polyrect.TL);
wmf_free (API,polyrect.BR);
}
@@ -2593,9 +2595,10 @@
polyrect.BR = 0;
polyrect.count = 0;
+
+ if (FR->region_clip) FR->region_clip (API,&polyrect);
}
- if (FR->region_clip) FR->region_clip (API,&polyrect);
return (changed);
}
commit libwmf for openSUSE:Factory
Hello community, here is the log from the commit of package libwmf for openSUSE:Factory checked in at 2015-06-24 20:32:18 Comparing /work/SRC/openSUSE:Factory/libwmf (Old) and /work/SRC/openSUSE:Factory/.libwmf.new (New) Package is "libwmf" Changes: --- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2015-06-12 21:15:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2015-06-24 20:32:19.0 +0200 @@ -8,3 +8,3 @@ -- Fix: DecodeImage() does not check that the run-length "count" - fits into the total size of the image, which can lead to a - heap-based buffer overflow (bsc#933109) +- Fix CVE-2015-4588: DecodeImage() does not check that the + run-length "count" fits into the total size of the image, + which can lead to a heap-based buffer overflow (bsc#933109) Other differences: --
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2015-06-12 21:15:01
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2014-08-28
21:05:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2015-06-12
21:15:02.0 +0200
@@ -1,0 +2,11 @@
+Thu Jun 11 07:11:53 UTC 2015 - fst...@suse.com
+
+- Added patches:
+ * libwmf-0.2.8.4-CVE-2015-0848.patch
+- Fix CVE-2015-0848: Heap overflow on libwmf0.2-7 (bsc#933109)
+ * libwmf-0.2.8.4-badrle.patch
+- Fix: DecodeImage() does not check that the run-length "count"
+ fits into the total size of the image, which can lead to a
+ heap-based buffer overflow (bsc#933109)
+
+---
New:
libwmf-0.2.8.4-CVE-2015-0848.patch
libwmf-0.2.8.4-badrle.patch
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.Dnvodo/_old 2015-06-12 21:15:03.0 +0200
+++ /var/tmp/diff_new_pack.Dnvodo/_new 2015-06-12 21:15:03.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libwmf
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -26,12 +26,14 @@
Url:http://wvWare.sourceforge.net/
Source:
http://downloads.sourceforge.net/project/wvware/%{name}/%{version}/%{name}-%{version}.tar.gz
Source2:baselibs.conf
-Patch0: libwmf-%{version}-ia64.patch
-Patch1: libwmf-%{version}-fix.patch
-Patch2: libwmf-%{version}-config.patch
-Patch3: libwmf-%{version}-overflow-CVE-2006-3376.patch
+Patch0: libwmf-0.2.8.4-ia64.patch
+Patch1: libwmf-0.2.8.4-fix.patch
+Patch2: libwmf-0.2.8.4-config.patch
+Patch3: libwmf-0.2.8.4-overflow-CVE-2006-3376.patch
Patch4: libwmf-0.2.8.4-gd_libpng.patch
Patch5: libwmf-0.2.8.4-bnc495842.patch
+Patch6: libwmf-0.2.8.4-CVE-2015-0848.patch
+Patch7: libwmf-0.2.8.4-badrle.patch
BuildRequires: gd-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
@@ -104,9 +106,11 @@
%patch3
%patch4
%patch5
+%patch6 -p1
+%patch7 -p1
%build
-%configure --prefix=/usr $RPM_ARCH-suse-linux --enable-magick
--libdir=%{_libdir}
+%configure --prefix=%{_prefix} $RPM_ARCH-suse-linux --enable-magick
--libdir=%{_libdir}
make %{?_smp_mflags}
%install
++ libwmf-0.2.8.4-CVE-2015-0848.patch ++
--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h2015-06-02 11:35:04.072201795 +0100
+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h2015-06-02 11:35:20.647406414 +0100
@@ -1145,8 +1143,15 @@
}
}
else
- { /* Convert run-length encoded raster pixels. */
- DecodeImage (API,bmp,src,(unsigned int)
bmp_info.compression,data->image);
+ {
+ if (bmp_info.bits_per_pixel == 8) /* Convert run-length
encoded raster pixels. */
+ {
+ DecodeImage (API,bmp,src,(unsigned int)
bmp_info.compression,data->image);
+ }
+ else
+ { WMF_ERROR (API,"Unexpected pixel depth");
+ API->err = wmf_E_BadFormat;
+ }
}
if (ERR (API))
++ libwmf-0.2.8.4-badrle.patch ++
diff -ru libwmf-0.2.8.4/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h2015-06-03 09:30:59.410501271 +0100
+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h2015-06-03 09:31:05.775572630 +0100
@@ -859,7 +859,7 @@
%
%
*/
-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int
compression,unsigned char* pixels)
+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int
compression,unsigned char* pixels)
{ int byte;
int count;
int i;
@@ -870,12 +870,14 @@
U32 u;
unsigned char* q;
+ unsigned char* end;
for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u]
= 0;
byte = 0;
x = 0;
q = pixels;
+ end = pixels + bmp->width * bmp->height;
for (y = 0; y < bmp->height; )
{ count = ReadBlobByte (src);
@@ -884,7 +886,10 @@
{ /* Encoded mode. */
byte = ReadBlobByte (src);
for (i = 0; i < count; i++)
- { if (compression == 1)
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2014-08-28 21:05:18
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2014-06-01
18:58:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2014-08-28
21:05:19.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 26 11:59:16 UTC 2014 - nadvor...@suse.com
+
+- dropped libwmf-devel -> libwmf-tools dependency (bnc#892356)
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.wBoaTX/_old 2014-08-28 21:05:20.0 +0200
+++ /var/tmp/diff_new_pack.wBoaTX/_new 2014-08-28 21:05:20.0 +0200
@@ -78,7 +78,6 @@
Requires: %{lname} = %{version}
Requires: libjpeg-devel
Requires: libpng-devel
-Requires: libwmf
Requires: libwmf-gnome = %{version}
Requires: xorg-x11-devel
Provides: mswordvd:%{_libexecdir}/libwmf.a
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2014-06-01 18:58:16
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2014-04-03
16:38:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2014-06-01
18:58:17.0 +0200
@@ -1,0 +2,6 @@
+Wed May 28 09:41:12 UTC 2014 - fst...@suse.com
+
+- Clean spec file with spec-cleaner
+- Do not distribute *.la files
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.nWjPQo/_old 2014-06-01 18:58:17.0 +0200
+++ /var/tmp/diff_new_pack.nWjPQo/_new 2014-06-01 18:58:17.0 +0200
@@ -16,20 +16,8 @@
#
-Name: libwmf
%define lname libwmf-0_2-7
-BuildRequires: gd-devel
-BuildRequires: gtk2-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
-BuildRequires: libxml2-devel
-BuildRequires: update-desktop-files
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-util-devel
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(xt)
-Provides: mswordvw:/usr/bin/wmftopng
-Provides: wv:/usr/bin/wmftopng
+Name: libwmf
Version:0.2.8.4
Release:0
Summary:Utilities for Displaying and Converting Metafile Images
@@ -38,12 +26,24 @@
Url:http://wvWare.sourceforge.net/
Source:
http://downloads.sourceforge.net/project/wvware/%{name}/%{version}/%{name}-%{version}.tar.gz
Source2:baselibs.conf
-Patch: libwmf-%{version}-ia64.patch
+Patch0: libwmf-%{version}-ia64.patch
Patch1: libwmf-%{version}-fix.patch
Patch2: libwmf-%{version}-config.patch
Patch3: libwmf-%{version}-overflow-CVE-2006-3376.patch
Patch4: libwmf-0.2.8.4-gd_libpng.patch
Patch5: libwmf-0.2.8.4-bnc495842.patch
+BuildRequires: gd-devel
+BuildRequires: gtk2-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
+BuildRequires: libxml2-devel
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-util-devel
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xt)
+Provides: mswordvw:%{_bindir}/wmftopng
+Provides: wv:%{_bindir}/wmftopng
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -55,34 +55,34 @@
Summary:Utilities for Displaying and Converting Metafile Images
Group: Productivity/Graphics/Other
# Prov/Obs added on 2011-11-22 (post openSUSE 12.1)
-Provides: libwmf = %version-%release
-Provides: wmf-utils = %version-%release
-Obsoletes: libwmf < %version-%release
-Obsoletes: wmf-utils < %version-%release
+Provides: libwmf = %{version}-%{release}
+Provides: wmf-utils = %{version}-%{release}
+Obsoletes: libwmf < %{version}-%{release}
+Obsoletes: wmf-utils < %{version}-%{release}
%description tools
These utilities read metafile images and can either display them
using the X Window System or convert them to standard formats such as
PNG, JPEG, PS, EPS, and more.
-%package -n %lname
+%package -n %{lname}
Summary:Library for reading Metafile Images
Group: System/Libraries
-%description -n %lname
+%description -n %{lname}
This library reads metafile images.
%package devel
-Requires: %lname = %{version}
-Requires: libwmf-gnome = %{version}
-Provides: mswordvd:/usr/lib/libwmf.a
-Provides: wv-devel:/usr/lib/libwmf.a
Summary:Static libraries, header files and documentation for libwmf
Group: Development/Libraries/C and C++
+Requires: %{lname} = %{version}
Requires: libjpeg-devel
Requires: libpng-devel
Requires: libwmf
+Requires: libwmf-gnome = %{version}
Requires: xorg-x11-devel
+Provides: mswordvd:%{_libexecdir}/libwmf.a
+Provides: wv-devel:%{_libexecdir}/libwmf.a
%description devel
The libwmf-devel package contains the header files and static libraries
@@ -99,10 +99,10 @@
%prep
%setup -q
-%patch -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch0
+%patch1
+%patch2
+%patch3
%patch4
%patch5
@@ -111,30 +111,31 @@
make %{?_smp_mflags}
%install
-mkdir -p $RPM_BUILD_ROOT/usr/include/libwmf
-make DESTDIR=$RPM_BUILD_ROOT \
+mkdir -p %{buildroot}%{_includedir}/libwmf
+make DESTDIR=%{buildroot} \
wmfdocdir=%{_defaultdocdir}/libwmf \
wmfonedocdir=%{_defaultdocdir}/libwmf/caolan \
install
-cp AUTHORS COPYING CREDITS ChangeLog README TODO
$RPM_BUILD_ROOT/%{_defaultdocdir}
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2014-04-03 16:38:30
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2013-04-18
15:00:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2014-04-03
16:38:40.0 +0200
@@ -1,0 +2,6 @@
+Wed Mar 5 15:37:30 UTC 2014 - nadvor...@suse.com
+
+- Add libwmf-0.2.8.4-bnc495842.patch to fix realloc return value
+ usage (bnc#495842, bnc#831299)
+
+---
New:
libwmf-0.2.8.4-bnc495842.patch
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.mOMMtG/_old 2014-04-03 16:38:40.0 +0200
+++ /var/tmp/diff_new_pack.mOMMtG/_new 2014-04-03 16:38:40.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libwmf
#
-# 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
@@ -43,6 +43,7 @@
Patch2: libwmf-%{version}-config.patch
Patch3: libwmf-%{version}-overflow-CVE-2006-3376.patch
Patch4: libwmf-0.2.8.4-gd_libpng.patch
+Patch5: libwmf-0.2.8.4-bnc495842.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -103,6 +104,7 @@
%patch2 -p0
%patch3 -p0
%patch4
+%patch5
%build
%configure --prefix=/usr $RPM_ARCH-suse-linux --enable-magick
--libdir=%{_libdir}
++ libwmf-0.2.8.4-bnc495842.patch ++
--- src/extra/gd/gd_clip.c
+++ src/extra/gd/gd_clip.c
@@ -69,6 +69,7 @@
if (im->clip->count == im->clip->max)
{ more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof
(gdClipRectangle));
if (more == 0) return;
+ im->clip->list = more;
im->clip->max += 8;
}
im->clip->list[im->clip->count] = (*rect);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2013-04-18 15:00:08
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf", Maintainer is "nadvor...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2012-06-25
14:23:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2013-04-18
15:00:09.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr 16 06:54:24 UTC 2013 - mmeis...@suse.com
+
+- Added url as source.
+ Please see http://en.opensuse.org/SourceUrls
+
+---
Old:
libwmf-0.2.8.4.tar.bz2
New:
libwmf-0.2.8.4.tar.gz
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.NcdFkP/_old 2013-04-18 15:00:10.0 +0200
+++ /var/tmp/diff_new_pack.NcdFkP/_new 2013-04-18 15:00:10.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libwmf
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -36,7 +36,7 @@
License:LGPL-2.1+
Group: Productivity/Graphics/Other
Url:http://wvWare.sourceforge.net/
-Source: libwmf-%{version}.tar.bz2
+Source:
http://downloads.sourceforge.net/project/wvware/%{name}/%{version}/%{name}-%{version}.tar.gz
Source2:baselibs.conf
Patch: libwmf-%{version}-ia64.patch
Patch1: libwmf-%{version}-fix.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2012-06-25 14:18:49
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf", Maintainer is "nadvor...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2012-03-06
14:05:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2012-06-25
14:23:54.0 +0200
@@ -1,0 +2,5 @@
+Mon Jun 18 10:24:18 UTC 2012 - dims...@opensuse.org
+
+- Add libwmf-0_2-7 to baselibs.conf.
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.gw0Xhm/_old 2012-06-25 14:23:55.0 +0200
+++ /var/tmp/diff_new_pack.gw0Xhm/_new 2012-06-25 14:23:55.0 +0200
@@ -28,8 +28,8 @@
BuildRequires: xorg-x11-util-devel
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xt)
-Provides: wv:/usr/bin/wmftopng
Provides: mswordvw:/usr/bin/wmftopng
+Provides: wv:/usr/bin/wmftopng
Version:0.2.8.4
Release:0
Summary:Utilities for Displaying and Converting Metafile Images
@@ -54,8 +54,10 @@
Summary:Utilities for Displaying and Converting Metafile Images
Group: Productivity/Graphics/Other
# Prov/Obs added on 2011-11-22 (post openSUSE 12.1)
-Provides: libwmf = %version-%release, wmf-utils = %version-%release
-Obsoletes: libwmf < %version-%release, wmf-utils < %version-%release
+Provides: libwmf = %version-%release
+Provides: wmf-utils = %version-%release
+Obsoletes: libwmf < %version-%release
+Obsoletes: wmf-utils < %version-%release
%description tools
These utilities read metafile images and can either display them
@@ -70,12 +72,16 @@
This library reads metafile images.
%package devel
-Requires: %lname = %{version}, libwmf-gnome = %{version}
-Provides: wv-devel:/usr/lib/libwmf.a
+Requires: %lname = %{version}
+Requires: libwmf-gnome = %{version}
Provides: mswordvd:/usr/lib/libwmf.a
+Provides: wv-devel:/usr/lib/libwmf.a
Summary:Static libraries, header files and documentation for libwmf
Group: Development/Libraries/C and C++
-Requires: libwmf libjpeg-devel libpng-devel xorg-x11-devel
+Requires: libjpeg-devel
+Requires: libpng-devel
+Requires: libwmf
+Requires: xorg-x11-devel
%description devel
The libwmf-devel package contains the header files and static libraries
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.gw0Xhm/_old 2012-06-25 14:23:55.0 +0200
+++ /var/tmp/diff_new_pack.gw0Xhm/_new 2012-06-25 14:23:55.0 +0200
@@ -1,3 +1,4 @@
libwmf
+libwmf-0_2-7
libwmf-gnome
supplements "packageand(libwmf-gnome:gtk2-)"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2012-03-06 14:05:19
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf", Maintainer is "nadvor...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2011-11-23
19:36:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2012-03-06
14:05:26.0 +0100
@@ -1,0 +2,17 @@
+Sat Mar 3 09:50:58 UTC 2012 - jeng...@medozas.de
+
+- Add libjpeg-devel as BuildRequires, needed to resolve build error
+- Add selected Xorg packages to BR to have wmf2x be built again
+
+---
+Mon Jan 30 00:19:40 UTC 2012 - jeng...@medozas.de
+
+- Remove further redundant sections
+
+---
+Tue Nov 29 15:23:14 UTC 2011 - jeng...@medozas.de
+
+- Actually use "libwmf-tools" instead of wmf-utils, this goes much
+ more in line with the preexisting libwpd-tools and libwps-tools.
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.KyFgMT/_old 2012-03-06 14:05:28.0 +0100
+++ /var/tmp/diff_new_pack.KyFgMT/_new 2012-03-06 14:05:28.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libwmf
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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,18 +16,26 @@
#
-
Name: libwmf
%define lname libwmf-0_2-7
-BuildRequires: gd-devel gtk2-devel libtiff-devel libxml2-devel
update-desktop-files
+BuildRequires: gd-devel
+BuildRequires: gtk2-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
+BuildRequires: libxml2-devel
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-util-devel
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xt)
Provides: wv:/usr/bin/wmftopng
Provides: mswordvw:/usr/bin/wmftopng
-License:LGPL-2.1+
-Group: Productivity/Graphics/Other
Version:0.2.8.4
-Release:218
+Release:0
Summary:Utilities for Displaying and Converting Metafile Images
-URL:http://wvWare.sourceforge.net/
+License:LGPL-2.1+
+Group: Productivity/Graphics/Other
+Url:http://wvWare.sourceforge.net/
Source: libwmf-%{version}.tar.bz2
Source2:baselibs.conf
Patch: libwmf-%{version}-ia64.patch
@@ -42,21 +50,14 @@
using the X Window System or convert them to standard formats such as
PNG, JPEG, PS, EPS, and more.
-
-
-Authors:
-
-Caolan McNamara
-Francis James Franklin
-
-%package -n wmf-utils
+%package tools
Summary:Utilities for Displaying and Converting Metafile Images
Group: Productivity/Graphics/Other
# Prov/Obs added on 2011-11-22 (post openSUSE 12.1)
-Provides: libwmf = %version-%release
-Obsoletes: libwmf < %version-%release
+Provides: libwmf = %version-%release, wmf-utils = %version-%release
+Obsoletes: libwmf < %version-%release, wmf-utils < %version-%release
-%description -n wmf-utils
+%description tools
These utilities read metafile images and can either display them
using the X Window System or convert them to standard formats such as
PNG, JPEG, PS, EPS, and more.
@@ -80,13 +81,6 @@
The libwmf-devel package contains the header files and static libraries
necessary for developing programs using libwmf.
-
-
-Authors:
-
-Caolan McNamara
-Francis James Franklin
-
%package gnome
Summary:GNOME plugin for displaying and Converting Metafile Images
Group: System/Libraries
@@ -96,13 +90,6 @@
using the X Window System or convert them to standard formats such as
PNG, JPEG, PS, EPS, and more.
-
-
-Authors:
-
-Caolan McNamara
-Francis James Franklin
-
%prep
%setup -q
%patch -p0
@@ -116,7 +103,6 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/include/libwmf
make DESTDIR=$RPM_BUILD_ROOT \
wmfdocdir=%{_defaultdocdir}/libwmf \
@@ -128,7 +114,7 @@
%postun -n %lname -p /sbin/ldconfig
-%files -n wmf-utils
+%files tools
%defattr(-,root,root)
/usr/bin/libwmf-fontmap
/usr/bin/wmf2eps
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libwmf for openSUSE:Factory
Hello community, here is the log from the commit of package libwmf for openSUSE:Factory checked in at 2011-12-06 18:26:13 Comparing /work/SRC/openSUSE:Factory/libwmf (Old) and /work/SRC/openSUSE:Factory/.libwmf.new (New) Package is "libwmf", Maintainer is "nadvor...@suse.com" Changes: Other differences: -- ++ libwmf.spec ++ --- /var/tmp/diff_new_pack.sOyP7H/_old 2011-12-06 18:47:36.0 +0100 +++ /var/tmp/diff_new_pack.sOyP7H/_new 2011-12-06 18:47:36.0 +0100 @@ -22,7 +22,7 @@ BuildRequires: gd-devel gtk2-devel libtiff-devel libxml2-devel update-desktop-files Provides: wv:/usr/bin/wmftopng Provides: mswordvw:/usr/bin/wmftopng -License:LGPLv2.1+ +License:LGPL-2.1+ Group: Productivity/Graphics/Other Version:0.2.8.4 Release:218 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libwmf for openSUSE:Factory
Hello community,
here is the log from the commit of package libwmf for openSUSE:Factory checked
in at 2011-11-23 19:36:32
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
and /work/SRC/openSUSE:Factory/.libwmf.new (New)
Package is "libwmf", Maintainer is "nadvor...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes2011-09-23
02:11:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2011-11-23
19:36:34.0 +0100
@@ -1,0 +2,7 @@
+Tue Nov 15 20:15:43 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant/unwanted tags/section (cf. specfile guidelines)
+- Apply shlib packaging (-> new libwmf-0_2-7 subpackage),
+ create "wmf-utils" subpackage as suggested by namtrac
+
+---
Other differences:
--
++ libwmf.spec ++
--- /var/tmp/diff_new_pack.8CmeEt/_old 2011-11-23 19:36:35.0 +0100
+++ /var/tmp/diff_new_pack.8CmeEt/_new 2011-11-23 19:36:35.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libwmf (Version 0.2.8.4)
+# spec file for package libwmf
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,20 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: libwmf
+%define lname libwmf-0_2-7
BuildRequires: gd-devel gtk2-devel libtiff-devel libxml2-devel
update-desktop-files
Provides: wv:/usr/bin/wmftopng
Provides: mswordvw:/usr/bin/wmftopng
License:LGPLv2.1+
-Group: System/Libraries
-AutoReqProv:on
+Group: Productivity/Graphics/Other
Version:0.2.8.4
Release:218
-Summary:Library and Utilities for Displaying and Converting Metafile
Images
-Url:http://wvWare.sourceforge.net/
+Summary:Utilities for Displaying and Converting Metafile Images
+URL:http://wvWare.sourceforge.net/
Source: libwmf-%{version}.tar.bz2
Source2:baselibs.conf
Patch: libwmf-%{version}-ia64.patch
@@ -50,14 +49,31 @@
Caolan McNamara
Francis James Franklin
+%package -n wmf-utils
+Summary:Utilities for Displaying and Converting Metafile Images
+Group: Productivity/Graphics/Other
+# Prov/Obs added on 2011-11-22 (post openSUSE 12.1)
+Provides: libwmf = %version-%release
+Obsoletes: libwmf < %version-%release
+
+%description -n wmf-utils
+These utilities read metafile images and can either display them
+using the X Window System or convert them to standard formats such as
+PNG, JPEG, PS, EPS, and more.
+
+%package -n %lname
+Summary:Library for reading Metafile Images
+Group: System/Libraries
+
+%description -n %lname
+This library reads metafile images.
+
%package devel
-License:LGPLv2.1+
-Requires: libwmf = %{version} libwmf-gnome = %{version}
+Requires: %lname = %{version}, libwmf-gnome = %{version}
Provides: wv-devel:/usr/lib/libwmf.a
Provides: mswordvd:/usr/lib/libwmf.a
Summary:Static libraries, header files and documentation for libwmf
Group: Development/Libraries/C and C++
-AutoReqProv:on
Requires: libwmf libjpeg-devel libpng-devel xorg-x11-devel
%description devel
@@ -72,7 +88,6 @@
Francis James Franklin
%package gnome
-License:LGPLv2.1+
Summary:GNOME plugin for displaying and Converting Metafile Images
Group: System/Libraries
@@ -109,14 +124,11 @@
install
cp AUTHORS COPYING CREDITS ChangeLog README TODO
$RPM_BUILD_ROOT/%{_defaultdocdir}/libwmf
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -n %lname -p /sbin/ldconfig
-%post -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%files
+%files -n wmf-utils
%defattr(-,root,root)
/usr/bin/libwmf-fontmap
/usr/bin/wmf2eps
@@ -127,7 +139,6 @@
/usr/bin/wmf2svg
/usr/bin/wmf2x
#
-%{_libdir}/libwmf*.so.*
#
/usr/share/libwmf
#
@@ -139,6 +150,10 @@
%doc %{_defaultdocdir}/libwmf/README
%doc %{_defaultdocdir}/libwmf/TODO
+%files -n %lname
+%defattr(-,root,root)
+%_libdir/libwmf*-0.2.so.7*
+
%files gnome
%defattr(-,root,root)
%dir %{_libdir}/gtk-*/*/loaders
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
