From 04be3a94ff2a52d4373d101fef0d56386ee58a53 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Jan 07 2006 04:21:21 +0000 Subject: g2. warning: very not stable. --- diff --git a/.cvsignore b/.cvsignore index 09d0f6b..8b6cf18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,4 @@ gnucash-1.8.11.tar.gz gnucash-docs-1.8.5.tar.gz +gnucash-docs-1.9.0.svn12279.tar.gz +gnucash-1.9.0.svn12279.tar.gz diff --git a/gnucash-1.8.6-64bit-fixes.patch b/gnucash-1.8.6-64bit-fixes.patch index a4e1249..31d0d69 100644 --- a/gnucash-1.8.6-64bit-fixes.patch +++ b/gnucash-1.8.6-64bit-fixes.patch @@ -9,25 +9,3 @@ gpointer user_data) { FILE *fh = (FILE *) user_data; ---- gnucash-1.8.8/aclocal.m4.cow 2004-03-12 17:36:40.478189512 -0500 -+++ gnucash-1.8.8/aclocal.m4 2004-03-12 17:37:23.728614448 -0500 -@@ -3304,7 +3304,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM ---- gnucash-1.8.8/acinclude.m4.cow 2004-03-12 17:36:51.352536360 -0500 -+++ gnucash-1.8.8/acinclude.m4 2004-03-12 17:37:10.250663408 -0500 -@@ -3374,7 +3374,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM diff --git a/gnucash.spec b/gnucash.spec index 8229b45..1f4a53e 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,23 +1,28 @@ -%define docver 1.8.5 +%define docver 1.9.0.svn12279 + +%define svnrev 12279 Name: gnucash Summary: GnuCash is an application to keep track of your finances. -Version: 1.8.11 -Release: 4.1 +Version: 1.9.0 +Release: 0.svn%{svnrev}.1 License: GPL/GFDL Group: Applications/Productivity -Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz -Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz +#Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz +#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz +Source: gnucash-%{version}.svn%{svnrev}.tar.bz2 +Source1: gnucash-docs-%{docver}.tar.bz2 +Patch: gnucash-gmemchunk.patch Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch +Patch5: gnucash-1.8.12-aq.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml-devel >= 1.1.4, -BuildPrereq: Guppi-devel, gal-devel, libxml-devel, db4-devel -BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel -BuildPrereq: readline-devel postgresql-devel /usr/bin/autoconf-2.13 -BuildPrereq: libofx-devel, aqhbci-devel, docbook-style-xsl -BuildPrereq: libtool-ltdl-devel, GConf-devel -BuildRequires: desktop-file-utils, scrollkeeper +BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml3-devel +BuildPrereq: postgresql-devel, libgsf-devel >= 1.12.2 +# cairo-devel >= 0.5.0 +BuildPrereq: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0 +BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl +BuildRequires: desktop-file-utils, scrollkeeper texinfo Requires: slib >= 3a1-5 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} @@ -42,21 +47,23 @@ want to keep your financial data in a database instead of a flat file (recommended for large volumes of data and commercial sites). %prep -%setup -q -a 1 -%patch3 -p1 -b .icon +%setup -q -n gnucash -a 1 +%patch -p1 +#%patch3 -p1 -b .icon %patch4 -p1 -b .64bit +%patch5 -p1 -b .aq %build -autoconf-2.13 -cp %{_datadir}/libtool/config.{sub,guess} . +./autogen.sh --prefix=/usr %configure --enable-sql --enable-error-on-warning=no \ --enable-ofx \ - --enable-hbci + --enable-hbci \ +# --with-cairo \ -make LIBTOOL=/usr/bin/libtool +make LIBTOOL=/usr/bin/libtool CC=gcc -cd gnucash-docs-%{docver} -autoconf-2.13 +cd gnucash-docs +./autogen.sh --prefix=/usr %configure make @@ -67,7 +74,7 @@ make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool %find_lang %{name} -cd gnucash-docs-%{docver} +cd gnucash-docs make install DESTDIR=$RPM_BUILD_ROOT || : # vfolder desktop file install stuff @@ -85,7 +92,9 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \ $RPM_BUILD_ROOT/%{_datadir}/aclocal \ $RPM_BUILD_ROOT/var/scrollkeeper \ $RPM_BUILD_ROOT/%{_libdir}/lib*.a \ - $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a + $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \ + $RPM_BUILD_ROOT/%{_datadir}/gnome/apps \ + $RPM_BUILD_ROOT/%{_libdir}/pkgconfig %clean rm -rf $RPM_BUILD_ROOT @@ -94,22 +103,33 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig /usr/bin/scrollkeeper-update -o %{_datadir}/omf/gnucash-docs +export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas" + +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null +done + %postun /sbin/ldconfig /usr/bin/scrollkeeper-update %files -f %{name}.lang %defattr(-,root,root,755) +%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gnucash %{_bindir}/* %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug -%exclude %{_libdir}/gnucash/libgncmod-backend-postgres* +%exclude %{_libdir}/libgnc-backend-postgres* +%{_datadir}/xml/* %{_datadir}/gnucash %{_datadir}/gnome/help/gnucash %{_datadir}/mime-info/gnucash.* %{_datadir}/omf/gnucash-docs -%{_datadir}/pixmaps/gnucash +%{_datadir}/pixmaps/goffice +%{_datadir}/goffice %{_datadir}/applications/* %{_mandir}/man*/* %config %{_sysconfdir}/gnucash @@ -119,9 +139,15 @@ rm -rf $RPM_BUILD_ROOT %files backend-postgres %defattr(-,root,root) %doc src/backend/postgres/README -%{_libdir}/gnucash/libgncmod-backend-postgres* +%{_libdir}/libgnc-backend-postgres* %changelog +* Sat Dec 24 2005 Bill Nottingham 1.9.0-0.12168.1 +- update to 2.x branch + +* Thu Dec 22 2005 Bill Nottingham 1.8.12-1 +- update to 1.8.12 + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index d9c8974..1370b6f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -62f94331936e37ed1b1d28b5a1863bb3 gnucash-1.8.11.tar.gz -9758d8e523530c2509912761e327a9d5 gnucash-docs-1.8.5.tar.gz +d8e816b84ec5c58e4e7b45e8f39d5573 gnucash-docs-1.9.0.svn12279.tar.gz +a585938158130ca5432e05be165982bd gnucash-1.9.0.svn12279.tar.gz