[goffice08] Drop pcre requirements. (Fixes the library to not have undefined symbols indirectly.)
Bill Nottingham
notting at fedoraproject.org
Tue Jul 10 15:45:11 UTC 2012
commit 5b2a8e65fccad0d0c0adfcdf60595b3ba2367125
Author: Bill Nottingham <notting at redhat.com>
Date: Tue Jul 10 11:44:50 2012 -0400
Drop pcre requirements. (Fixes the library to not have undefined symbols indirectly.)
goffice-glib.patch | 12 ++++++++++++
goffice-pcre.patch | 13 -------------
goffice08.spec | 10 ++++++----
3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/goffice-glib.patch b/goffice-glib.patch
new file mode 100644
index 0000000..15c3390
--- /dev/null
+++ b/goffice-glib.patch
@@ -0,0 +1,12 @@
+diff -up goffice-0.8.17/configure.cow goffice-0.8.17/configure
+--- goffice-0.8.17/configure.cow 2012-07-10 11:29:55.491034608 -0400
++++ goffice-0.8.17/configure 2012-07-10 11:30:02.378034799 -0400
+@@ -15161,7 +15161,7 @@ LIBS="$GOFFICE_LIBS $LIBS"
+ $as_echo_n "checking for G_REGEX_ERROR_STRAY_BACKSLASH... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <glib/gregex.h>
++#include <glib.h>
+ int
+ main ()
+ {
diff --git a/goffice08.spec b/goffice08.spec
index f23ea26..6ea4038 100644
--- a/goffice08.spec
+++ b/goffice08.spec
@@ -2,7 +2,7 @@
Name: goffice08
Version: 0.8.17
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Goffice support libraries
Group: System Environment/Libraries
# bug filed upstream about this being GPL v2 only:
@@ -13,8 +13,7 @@ Source0: http://ftp.gnome.org/pub/gnome/sources/%{realname}/0.8/%{realnam
BuildRequires: libgsf-devel >= 1.13.3
BuildRequires: libgnomeui-devel >= 2.0.0
BuildRequires: intltool gettext
-BuildRequires: pcre-devel pcre-tools
-Patch0: goffice-pcre.patch
+Patch1: goffice-glib.patch
Provides: %{realname} = %{version}-%{release}
%description
@@ -37,7 +36,7 @@ Use goffice08 if your goffice application is built against GTK2.
%prep
%setup -q -n %{realname}-%{version}
-%patch0 -p1
+%patch1 -p1
%build
%configure --disable-dependency-tracking
@@ -74,6 +73,9 @@ rm $RPM_BUILD_ROOT/%{_libdir}/%{realname}/%{version}/plugins/*/*.la
%changelog
+* Tue Jul 10 2012 Bill Nottingham <notting at redhat.com> - 0.8.17-7
+- fix configury so pcre isn't accidentally used, drop pcre requirements
+
* Mon Mar 12 2012 Bill Nottingham <notting at redhat.com> - 0.8.17-6
- drop obsolete libgsf-gnome requirement
More information about the scm-commits
mailing list