diff --git a/.gitignore b/.gitignore index a5aa2d5..f3020f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gnucash-2.4.13.tar.bz2 +/gnucash-2.6.0.tar.bz2 diff --git a/gnucash-quiet.patch b/gnucash-quiet.patch deleted file mode 100644 index dbf6019..0000000 --- a/gnucash-quiet.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnucash-2.3.12/src/bin/gnucash-bin.c.orig gnucash-2.3.12/src/bin/gnucash-bin.c ---- gnucash-2.3.12/src/bin/gnucash-bin.c.orig 2010-04-10 20:22:18.000000000 -0400 -+++ gnucash-2.3.12/src/bin/gnucash-bin.c 2010-04-30 16:12:54.172388707 -0400 -@@ -716,8 +716,6 @@ main(int argc, char ** argv) - g_error_free(binreloc_error); - } - } --#else -- g_message("main: binreloc relocation support was disabled at configure time.\n"); - #endif - - /* This should be called before gettext is initialized diff --git a/gnucash.spec b/gnucash.spec index ff008d4..7591abc 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,37 +1,32 @@ -%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_import_qif.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas - + Name: gnucash Summary: Finance management application -Version: 2.4.13 +Version: 2.6.0 URL: http://gnucash.org/ -Release: 5%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2 Source2: gnucash.appdata.xml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: webkitgtk-devel, libxml2 >= 2.5.10, zlib-devel +BuildRequires: webkitgtk-devel, libxml2 >= 2.5.10, libxslt-devel, zlib-devel BuildRequires: libgsf-devel >= 1.12.2, goffice-devel < 0.9, swig BuildRequires: libglade2-devel >= 2.4, libgnomeui-devel >= 2.4 -BuildRequires: libofx-devel, aqbanking-devel, guile-devel < 5:2.0 +BuildRequires: libofx-devel, aqbanking-devel, guile-devel >= 5:2.0 BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, libtool, intltool BuildRequires: python-devel, libdbi-devel -BuildRequires: libtool-ltdl-devel, GConf2-devel +BuildRequires: libdbi-dbd-mysql, libdbi-dbd-pgsql, libdbi-dbd-sqlite +BuildRequires: libtool-ltdl-devel BuildRequires: ktoblzcheck-devel -BuildRequires: slib >= 3a1-5 -Patch0: gnucash-quiet.patch Requires: gnucash-docs >= 2.2.0 -Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) %if 0%{?fedora} <= 14 && 0%{?rhel} <= 6 # for HBCI setup wizard Requires: qbanking %endif -Requires(pre): GConf2 -Requires(post): /sbin/ldconfig, GConf2 -Requires(preun): GConf2 +Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: gnucash-backend-postgres @@ -44,13 +39,10 @@ balanced books. %prep %setup -q -%patch0 -p1 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build sed -i 's|get_python_lib(0|get_python_lib(1|g' configure -sed -i 's|guile-config|guile1.8-config|g' configure -export GUILE=/usr/bin/guile1.8 %configure --enable-error-on-warning=no \ --enable-ofx \ --enable-aqbanking \ @@ -58,7 +50,8 @@ export GUILE=/usr/bin/guile1.8 --enable-locale-specific-tax \ --enable-dbi \ --disable-static \ - --enable-python-bindings + --docdir=%{_datadir}/doc/gnucash-%{version} \ + --enable-python #sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool #sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -91,49 +84,40 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \ find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \; -rm -rf $RPM_BUILD_ROOT/etc/gconf/gconf.xml.defaults - mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/ %clean rm -rf $RPM_BUILD_ROOT -%pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) - gconftool-2 --makefile-uninstall-rule %{schemas} >/dev/null || : -fi - %post -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) -gconftool-2 --makefile-install-rule %{schemas} >/dev/null || : touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) - gconftool-2 --makefile-uninstall-rule %{schemas} >/dev/null || : -fi %postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + [ -x /usr/bin/gtk-update-icon-cache] && /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || fi +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root) -%{_sysconfdir}/gconf/schemas/* +%docdir %{_datadir}/doc/gnucash-%{version} +%{_datadir}/doc/gnucash-%{version} %dir %{_sysconfdir}/gnucash %{_bindir}/* %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug +%{_datadir}/glib-2.0/schemas/* %{_datadir}/gnucash %{_datadir}/appdata/* %{_datadir}/applications/* @@ -141,10 +125,11 @@ fi %{_mandir}/man*/* %{python_sitearch}/gnucash %config(noreplace) %{_sysconfdir}/gnucash/* -%doc AUTHORS COPYING ChangeLog* HACKING NEWS README -%doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI %changelog +* Thu Jan 16 2014 Bill Nottingham - 2.6.0-1 +- update to 2.6.0 + * Mon Sep 23 2013 Bill Nottingham - 2.4.13-5 - rebuild against new libofx diff --git a/sources b/sources index 22b67f7..ce77ab8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee73b3fac8bac4bf1c3a39a33302a27d gnucash-2.4.13.tar.bz2 +52edee40b03120d2646a47463f675d9a gnucash-2.6.0.tar.bz2