[grisbi] Try to fix build on Rawhide
Aurelien Bompard
abompard at fedoraproject.org
Wed Oct 12 03:43:45 UTC 2011
commit 0630eae35252ac8b7481f4b3a10c2f80d8744cdc
Author: Aurelien Bompard <abompard at fedoraproject.org>
Date: Wed Oct 12 05:43:25 2011 +0200
Try to fix build on Rawhide
grisbi-dso.patch | 22 ++++++++++++----------
grisbi.spec | 10 +++++++++-
2 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/grisbi-dso.patch b/grisbi-dso.patch
index 8e12d4b..67fb764 100644
--- a/grisbi-dso.patch
+++ b/grisbi-dso.patch
@@ -1,11 +1,13 @@
---- configure.in.dso 2010-04-28 18:19:58.000000000 +0200
-+++ configure.in 2010-05-20 08:48:19.619648407 +0200
-@@ -261,6 +261,8 @@
- AC_SUBST(GSB_NOOPTIM)
+diff -up ./configure.in.missinglib ./configure.in
+--- ./configure.in.missinglib 2011-10-12 05:37:01.783508981 +0200
++++ ./configure.in 2011-10-12 05:37:13.883580016 +0200
+@@ -57,7 +57,7 @@ dnl ====================================
+ #PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2 zlib])
+ # Temporary hack until Mandriva ships zlib.pc
+ PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.18.0 gmodule-2.0 >= 2.18.0])
+-GRISBI_LIBS="$GRISBI_LIBS -lz"
++GRISBI_LIBS="$GRISBI_LIBS -lz -lm"
+ AC_SUBST(GRISBI_LIBS)
+ # </hack>
-
-+# Avoid implicit dynamic linking
-+LDFLAGS="${LDFLAGS} -lm -lz"
-
- AC_SUBST(GTK_LIBS)
- AC_SUBST(GTK_CFLAGS)
+diff -up ./src/Makefile.missinglib ./src/Makefile
diff --git a/grisbi.spec b/grisbi.spec
index 35c39be..eb828b7 100644
--- a/grisbi.spec
+++ b/grisbi.spec
@@ -1,18 +1,21 @@
Name: grisbi
Version: 0.8.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Personal finances manager
Group: Applications/Productivity
License: GPLv2+
URL: http://www.grisbi.org
Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2
+Patch0: grisbi-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, libxml2-devel, glib2-devel, gettext
BuildRequires: desktop-file-utils, libofx-devel >= 0.7.0
BuildRequires: openssl-devel
BuildRequires: intltool
+# Only as long as we have to run autogen.sh
+BuildRequires: gettext-devel
Requires: xdg-utils
@@ -30,6 +33,8 @@ party, nice and easy user interface, user manual, QIF import/export.
%prep
%setup -q
+%patch0 -p0 -b .dso
+autoreconf
%build
%configure
@@ -69,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 12 2011 Aurelien Bompard <abompard at fedoraproject.org> - 0.8.8-2
+- fix build on rawhide
+
* Tue Oct 11 2011 Aurelien Bompard <abompard at fedoraproject.org> - 0.8.8-1
- version 0.8.8
More information about the scm-commits
mailing list