From ec930e24cc972851c2f5f4c68efe48b8606aca40 Mon Sep 17 00:00:00 2001 From: Aurelien Bompard Date: May 05 2010 20:39:55 +0000 Subject: - Fix build without ld's implicit linking (http://fedoraproject.org/wiki/UnderstandingDSOLinkChange) --- diff --git a/grisbi-dso.patch b/grisbi-dso.patch new file mode 100644 index 0000000..65b6085 --- /dev/null +++ b/grisbi-dso.patch @@ -0,0 +1,12 @@ +diff -up ./configure.in.implicit ./configure.in +--- ./configure.in.implicit 2010-05-05 09:22:03.771470768 +0200 ++++ ./configure.in 2010-05-05 09:22:42.459497327 +0200 +@@ -51,7 +51,7 @@ AM_CONDITIONAL(NOOFX, test x$noofx = xtr + AC_SUBST(prefix) + + PKG_CHECK_MODULES(GRISBI, gtk+-2.0 >= 2.2.0 glib-2.0 libxml-2.0 >= 2.0) +-LDFLAGS="${LDFLAGS} ${GRISBI_LIBS}" ++LDFLAGS="${LDFLAGS} ${GRISBI_LIBS} -lm" + CFLAGS="${CFLAGS} ${GRISBI_CFLAGS}" + + diff --git a/grisbi.spec b/grisbi.spec index cee858b..6f5c2d6 100644 --- a/grisbi.spec +++ b/grisbi.spec @@ -1,7 +1,7 @@ %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help Name: grisbi Version: 0.5.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Personal finances manager Group: Applications/Productivity @@ -11,10 +11,14 @@ Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grisbi-0.5.9-xdgopen.patch Patch1: grisbi-0.5.9-check.g_free.patch +Patch2: 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 +# Only as long as we have to run autogen.sh +BuildRequires: gettext-devel + Requires: xdg-utils # for report generation Requires: texlive-texmf-latex, texlive-dvips @@ -35,6 +39,8 @@ party, nice and easy user interface, user manual, QIF import/export. %setup -q %patch0 -p0 -b .xdgopen %patch1 -p1 -b .check-g_free +%patch2 -p0 -b .dso +./autogen.sh %build %configure @@ -114,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html %changelog +* Wed May 05 2010 Aurelien Bompard - 0.5.9-11 +- Fix build without ld's implicit linking + (http://fedoraproject.org/wiki/UnderstandingDSOLinkChange) + * Fri Jul 24 2009 Fedora Release Engineering - 0.5.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild