From 6a742591a5caa2d0a9460fa80fbad37ec5ffc61f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Apr 19 2011 16:41:16 +0000 Subject: Update to 2.4.5, clean out upstreamed patch. --- diff --git a/.gitignore b/.gitignore index 493ae71..94560b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gnucash-2.4.4.tar.bz2 +/gnucash-2.4.5.tar.bz2 diff --git a/fix-webkit-config.patch b/fix-webkit-config.patch deleted file mode 100644 index 38ae7ed..0000000 --- a/fix-webkit-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -fix-webkit-config.patch - -From: Andy Clayton - -Fix configure.ac to correctly use WEBKIT_LIBS from pkg-config ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 79373b7..b781c81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1005,7 +1005,7 @@ then - *) - # Unsure - check functions exist - oLIBS="$LIBS" -- LIBS="$LIBS -lwebkit-1.0" -+ LIBS="$LIBS ${WEBKIT_LIBS}" - AC_CHECK_FUNCS(webkit_web_view_load_uri) - LIBS="$oLIBS" - AC_MSG_CHECKING(for webkit_web_frame_print_full) diff --git a/gnucash.spec b/gnucash.spec index ce9a9c5..638b215 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -2,9 +2,9 @@ Name: gnucash Summary: Finance management application -Version: 2.4.4 +Version: 2.4.5 URL: http://gnucash.org/ -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/gnucash-%{version}.tar.bz2 @@ -17,7 +17,6 @@ BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool BuildRequires: python-devel, libdbi-devel Patch0: gnucash-quiet.patch -Patch1: fix-webkit-config.patch Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -41,7 +40,6 @@ balanced books. %prep %setup -q %patch0 -p1 -%patch1 -p1 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build @@ -136,6 +134,9 @@ fi %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI %changelog +* Tue Apr 19 2011 Bill Nottingham - 2.4.5-1 +- update to 2.4.5 + * Fri Mar 18 2011 Bill Nottingham - 2.4.4-2 - fix configure.ac to correctly use WEBKIT_LIBS from pkg-config (#670001, ) diff --git a/sources b/sources index 00851e6..7d26615 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ae973bf925cde0721c7c465536bc096 gnucash-2.4.4.tar.bz2 +94168fe959743fc342812ac3a01814a1 gnucash-2.4.5.tar.bz2