Hello community, here is the log from the commit of package wv2 for openSUSE:Factory checked in at 2012-01-10 14:51:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wv2 (Old) and /work/SRC/openSUSE:Factory/.wv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wv2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/wv2/wv2.changes 2011-11-29 16:25:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wv2.new/wv2.changes 2012-01-10 14:51:43.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Jan 9 13:58:09 UTC 2012 - [email protected] + +- add glib_include.patch to fix + "Only <glib.h> can be included directly." + +------------------------------------------------------------------- +Tue Nov 29 22:31:49 UTC 2011 - [email protected] + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building +- Pick appropriate package egroups + +------------------------------------------------------------------- New: ---- glib_include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wv2.spec ++++++ --- /var/tmp/diff_new_pack.KgelVl/_old 2012-01-10 14:51:44.000000000 +0100 +++ /var/tmp/diff_new_pack.KgelVl/_new 2012-01-10 14:51:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wv2 # -# 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 @@ -23,8 +23,9 @@ License: LGPLv2.1+ Summary: Library for Importing Microsoft Word (tm) Documents Url: http://sourceforge.net/projects/wvware -Group: System/Libraries +Group: Productivity/Publishing/Word Source: %{name}-%{version}.tar.bz2 +Patch0: glib_include.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libgsf-devel @@ -37,16 +38,14 @@ %package -n libwv2-4 Summary: Library for Importing Microsoft Word (tm) Documents Group: System/Libraries -License: LGPLv2.1+ %description -n libwv2-4 The wv2 library is used to import Microsoft Word documents in koffice for example. %package devel -License: LGPLv2.1+ Summary: Library for Importing Microsoft Word(tm) Documents - development files -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: bzip2 Requires: libgsf-devel Requires: libstdc++-devel @@ -58,6 +57,7 @@ %prep %setup -q +%patch0 -p1 %build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -66,7 +66,7 @@ %endif . # THAT DOT BELONGS TO THE CMAKE CALL -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall @@ -82,9 +82,6 @@ %postun -n libwv2-4 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -n libwv2-4 %defattr(-, root, root) %dir %_defaultdocdir/wv2 ++++++ glib_include.patch ++++++ diff -rupN wv2-0.4.2.orig/src/olestream.h wv2-0.4.2/src/olestream.h --- wv2-0.4.2.orig/src/olestream.h 2009-10-31 19:22:43.000000000 +0100 +++ wv2-0.4.2/src/olestream.h 2012-01-09 14:51:45.297024876 +0100 @@ -23,7 +23,7 @@ #include "global.h" // U8,... typedefs #include <stack> -#include <glib/giochannel.h> // GSeekType +#include <glib.h> // GSeekType namespace wvWare { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
