Hello community, here is the log from the commit of package goffice-0_8 for openSUSE:Factory checked in at 2012-11-19 07:05:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goffice-0_8 (Old) and /work/SRC/openSUSE:Factory/.goffice-0_8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "goffice-0_8", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/goffice-0_8/goffice-0_8.changes 2012-02-20 16:12:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.goffice-0_8.new/goffice-0_8.changes 2012-11-19 07:05:08.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 14 11:44:05 UTC 2012 - dims...@opensuse.org + +- Add goffice-0_8-pcre16.patch: fix build when using pcre that was + built with --enable-pcre16. In this case, the output of + "pcretest -C" is "UTF-8 and UTF-16 support", which was not cought + by the original regex in configure.in. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, as + above patch touches the build system. + +------------------------------------------------------------------- New: ---- goffice-0_8-pcre16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goffice-0_8.spec ++++++ --- /var/tmp/diff_new_pack.JUzRl1/_old 2012-11-19 07:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.JUzRl1/_new 2012-11-19 07:05:09.000000000 +0100 @@ -28,8 +28,11 @@ Source: http://download.gnome.org/sources/goffice/0.8/%{_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM goffice-0_8-pcre-8_30.patch bgo#670316 dims...@opensuse.org -- Port pcre_info to pcre_fullinfo to support pcre 8.30. Patch0: goffice-0_8-pcre-8_30.patch +# PATCH-FIX-UPSTREAM goffice-0_8-pcre16.patch dims...@opensuse.org -- Fix build against pcre16 enabled pcre. Not submitted upstream, as goffice 0.8 is unmaintained and 0.9.x does not suffer from this issue. +Patch1: goffice-0_8-pcre16.patch BuildRequires: fdupes BuildRequires: gconf2-devel +BuildRequires: gnome-common BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libgsf-devel @@ -89,9 +92,11 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 translation-update-upstream %build +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-static --with-pic make %{?jobs:-j%jobs} ++++++ goffice-0_8-pcre16.patch ++++++ Index: goffice-0.8.17/configure.in =================================================================== --- goffice-0.8.17.orig/configure.in +++ goffice-0.8.17/configure.in @@ -516,7 +516,7 @@ if test "x$glib_has_G_REGEX_ERROR_STRAY_ AC_CHECK_HEADER(pcre.h,[], AC_MSG_ERROR([Header files for PCRE were not found])) AC_CHECK_LIB(pcre,pcre_compile2,[], AC_MSG_ERROR([The PCRE library is missing or too old])) AC_MSG_CHECKING([for UTF-8 support in pcre]) - if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then + if (pcretest -C 2>&1) | grep -i "^ *UTF-8 .*support" >/dev/null; then AC_MSG_RESULT(yes) LIBS="$LIBS -lpcre" EXTRA_LIBS="$EXTRA_LIBS -lpcre" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
