From e6b73bb3f809ec9d8ad362eb0dce9bf21e31902c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 05:47:58 +0000 Subject: auto-import changelog data from gnucash-1.8.8-5.src.rpm Sat Mar 20 2004 Bill Nottingham 1.8.8-5 - reinstate libtool helper files (#118495) Fri Mar 12 2004 Bill Nottingham 1.8.8-4 - rebuild against separate libofx/openhbci Tue Mar 02 2004 Elliot Lee - rebuilt Fri Feb 13 2004 Elliot Lee - rebuilt Tue Dec 23 2003 Bill Nottingham - add a 64-bit patch from mandrake --- diff --git a/.cvsignore b/.cvsignore index 35b58b0..14f9bc6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,2 @@ gnucash-1.8.8.tar.gz gnucash-docs-1.8.3.tar.gz -libofx-0.6.4.tar.gz -openhbci-0.9.13.tar.gz diff --git a/gnucash-1.8.6-64bit-fixes.patch b/gnucash-1.8.6-64bit-fixes.patch new file mode 100644 index 0000000..a4e1249 --- /dev/null +++ b/gnucash-1.8.6-64bit-fixes.patch @@ -0,0 +1,33 @@ +--- gnucash-1.8.6/src/gnome-utils/gnc-html.c.64bit-fixes 2003-04-12 19:03:30.000000000 +0200 ++++ gnucash-1.8.6/src/gnome-utils/gnc-html.c 2003-10-02 11:06:06.000000000 +0200 +@@ -1315,7 +1315,7 @@ gnc_html_set_button_cb(gnc_html * html, + static gboolean + raw_html_receiver (gpointer engine, + const gchar *data, +- guint len, ++ size_t len, + 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 4a42c94..13d3160 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,25 +1,22 @@ %define docver 1.8.3 -%define hbciver 0.9.13 -%define ofxver 0.6.4 Name: gnucash Summary: GnuCash is an application to keep track of your finances. Version: 1.8.8 -Release: 2 -License: GPL/LGPL/GFDL +Release: 5 +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 -Source2: http://prdownloads.sourceforge.net/libofx/libofx-%{ofxver}.tar.gz -Source3: http://prdownloads.sourceforge.net/openhbci/openhbci-%{hbciver}.tar.gz Patch2: gnucash-1.6.0-info.patch Patch3: gnucash-1.8.5-db.patch +Patch4: gnucash-1.8.6-64bit-fixes.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: openssl-devel, openjade-devel, docbook-style-xsl +BuildPrereq: libofx-devel, openhbci-devel, docbook-style-xsl BuildRequires: desktop-file-utils Prereq: /sbin/ldconfig, /sbin/install-info, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} @@ -44,62 +41,28 @@ 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 -a 2 -a 3 +%setup -q -a 1 %patch2 -p1 -b .dir %patch3 -p0 -b .db +%patch4 -p1 -b .64bit %build - -# libofx -cd libofx-%{ofxver} -%configure --with-opensp-libs=%{_libdir} -make %{?_smp_mflags} -rm -rf $RPM_BUILD_ROOT -%makeinstall -rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc - -# openhbci -cd ../openhbci-%{hbciver} -%configure --with-openssl-libs=%{_libdir} -make %{?_smp_mflags} -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_libdir} -mv $RPM_BUILD_ROOT/usr/lib/openhbci $RPM_BUILD_ROOT/%{_libdir} || : - -perl -pi -e "s|dir=\"/usr\"|dir=\"$RPM_BUILD_ROOT/usr\"|g" \ - $RPM_BUILD_ROOT/usr/bin/openhbci-config -perl -pi -e 's|$dir/lib|$dir/%{_lib}|g' \ - $RPM_BUILD_ROOT/usr/bin/openhbci-config - -cd .. - - autoconf-2.13 cp %{_datadir}/libtool/config.{sub,guess} . -export LIBOFX_LIBS=-L$RPM_BUILD_ROOT/%{_libdir} -export LIBOFX_CFLAGS=-I$RPM_BUILD_ROOT/%{_includedir} %configure --enable-sql --enable-error-on-warning=no \ --enable-ofx \ - --enable-hbci --with-openhbci-prefix=$RPM_BUILD_ROOT/usr \ - --disable-openhbcitest -unset LIBOFX_LIBS LIBOFX_CFLAGS + --enable-hbci make LIBTOOL=/usr/bin/libtool -# Blah. Again. -cd src -for foo in `find . -name "*.la"` ; do - sed "s|relink_command|#relink_command|g" $foo > $foo.new - mv -f $foo.new $foo -done -cd .. - cd gnucash-docs-%{docver} autoconf-2.13 %configure make %install +rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool %find_lang %{name} @@ -121,11 +84,8 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir \ $RPM_BUILD_ROOT/%{_includedir} \ $RPM_BUILD_ROOT/%{_datadir}/aclocal \ $RPM_BUILD_ROOT/var/scrollkeeper \ - $RPM_BUILD_ROOT/%{_datadir}/doc/libofx \ - $RPM_BUILD_ROOT/%{_libdir}/lib{ofx,openhbci}.{la,so} \ $RPM_BUILD_ROOT/%{_libdir}/lib*.a \ - $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \ - $RPM_BUILD_ROOT/%{_bindir}/openhbci-config + $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a %clean rm -rf $RPM_BUILD_ROOT @@ -153,7 +113,6 @@ fi %{_datadir}/gnucash %{_datadir}/gnome/help/gnucash %{_datadir}/mime-info/gnucash.* -%{_datadir}/libofx %{_datadir}/omf/gnucash-docs %{_datadir}/pixmaps/gnucash %{_datadir}/applications/* @@ -168,6 +127,21 @@ fi %{_libdir}/gnucash/libgncmod-backend-postgres* %changelog +* Sat Mar 20 2004 Bill Nottingham 1.8.8-5 +- reinstate libtool helper files (#118495) + +* Fri Mar 12 2004 Bill Nottingham 1.8.8-4 +- rebuild against separate libofx/openhbci + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Dec 23 2003 Bill Nottingham +- add a 64-bit patch from mandrake + * Wed Dec 3 2003 Bill Nottingham 1.8.8-2 - rebuild diff --git a/sources b/sources index 8ec66cb..33a6f08 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ 6a68e1517cfab40869fd7151b71457ee gnucash-1.8.8.tar.gz 5344138acf9b6a7bf77d0a06511e11e0 gnucash-docs-1.8.3.tar.gz -4f73e6fe393dedac3961e5145aa95c6c libofx-0.6.4.tar.gz -725605239b260ba04c808a9a280d6e85 openhbci-0.9.13.tar.gz