Accepting request 99167 from GNOME:Apps

Remove patch not needed by 0.8.9 so we can push update to Factory (forwarded request 99165 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/99167
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grisbi?expand=0&rev=8
This commit is contained in:
Stephan Kulow 2012-01-09 10:15:18 +00:00 committed by Git OBS Bridge
commit 9e2deacb0a
5 changed files with 25 additions and 46 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c69fbdff557c4b82de0b878fc2b7f6c93ab9abd72351eabbdecc9be4d78946f
size 1905934

3
grisbi-0.8.9.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea01522bc4fa34bc0ba4b94324c15218f3d79d4a5cfcd44f87a2ef8eed101080
size 1923855

View File

@ -1,27 +0,0 @@
Index: grisbi-0.8.8/configure.in
===================================================================
--- grisbi-0.8.8.orig/configure.in
+++ grisbi-0.8.8/configure.in
@@ -54,6 +54,9 @@ dnl ====================================
dnl Main Grisbi libraries
dnl ================================================================
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
#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])
Index: grisbi-0.8.8/src/Makefile.am
===================================================================
--- grisbi-0.8.8.orig/src/Makefile.am
+++ grisbi-0.8.8/src/Makefile.am
@@ -16,7 +16,7 @@ libgrisbi_la_LIBADD += \
else
libgrisbi_la_LDFLAGS = -export_dynamic
endif
-libgrisbi_la_LIBADD += $(GRISBI_LIBS) $(IGE_MAC_LIBS)
+libgrisbi_la_LIBADD += $(LIBM) $(GRISBI_LIBS) $(IGE_MAC_LIBS)
libgrisbi_la_SOURCES = \
accueil.c \

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jan 4 09:41:42 UTC 2012 - vuntz@opensuse.org
- Update to version 0.8.9:
+ Fix a potential crash when closing Grisbi.
+ Fix --without-ofx configure option.
+ Minor changes.
- Drop grisbi-fix-linking.patch: fixed upstream.
- Remove call to autoreconf and libtool BuildRequires: they were
only needed for the patch above.
- Stop passing --with-ofx to configure as... this breaks the build
for ofx support. We use automatic detection now, and the build
will fail if ofx support is missing as the plugin listed in
%files will be missing.
-------------------------------------------------------------------
Sat Oct 15 04:47:11 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,8 @@
# vim: set sw=4 ts=4 et:
#
# spec file for package grisbi
#
# 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
@ -16,23 +17,19 @@
#
Name: grisbi
Version: 0.8.8
Release: 1
License: GPL-2.0+
Version: 0.8.9
Release: 0
Summary: Personal Accounting Application
Url: http://www.grisbi.org
License: GPL-2.0+
Group: Productivity/Office/Finance
Url: http://www.grisbi.org
Source: http://downloads.sourceforge.net/project/grisbi/grisbi%20stable/0.8.x/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM grisbi-fix-linking.patch vuntz@opensuse.org -- Fix build with strict linker; sent upstream by mail on 2011-09-19
Patch0: grisbi-fix-linking.patch
# Needed for make check
#BuildRequires: cunit-devel
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libofx-devel
BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gtk+-2.0)
@ -50,14 +47,10 @@ One notable feature is that it respects French accounting rules.
%lang_package
%prep
%setup -q
%patch0 -p1
%build
# needed for patch0
autoreconf -fi
%configure \
--disable-static \
--with-ofx
--disable-static
make %{?jobs:-j%{jobs}}
%install
@ -94,6 +87,4 @@ rm %{buildroot}%{_datadir}/mime-info/grisbi.{keys,mime}
%files lang -f %{name}.lang
# vim: set sw=4 ts=4 et:
%changelog