rpms/gnucash/devel gnucash-1.8.12-aq.patch, NONE, 1.1.2.1 gnucash-gmemchunk.patch, NONE, 1.1.2.1 .cvsignore, 1.12, 1.12.2.1 gnucash-1.8.6-64bit-fixes.patch, 1.1, 1.1.2.1 gnucash.spec, 1.18, 1.18.2.1 sources, 1.12, 1.12.2.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jan 7 04:21:25 UTC 2006
Author: notting
Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15095
Modified Files:
Tag: gnucash-g2-branch
.cvsignore gnucash-1.8.6-64bit-fixes.patch gnucash.spec
sources
Added Files:
Tag: gnucash-g2-branch
gnucash-1.8.12-aq.patch gnucash-gmemchunk.patch
Log Message:
g2. warning: very not stable.
gnucash-1.8.12-aq.patch:
aqbanking.m4 | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
--- NEW FILE gnucash-1.8.12-aq.patch ---
--- gnucash-1.8.12/macros/aqbanking.m4.foo 2005-12-22 01:38:10.000000000 -0500
+++ gnucash-1.8.12/macros/aqbanking.m4 2005-12-22 01:43:49.000000000 -0500
@@ -49,7 +49,7 @@
/"])
for li in $lcc_dir; do
- if test -x "$li/bin/aqbanking-config"; then
+ if test -x "$li/include/aqbanking"; then
aqbanking_dir="$li";
break
fi
@@ -65,19 +65,19 @@
else
AC_MSG_RESULT($aqbanking_dir)
AC_MSG_CHECKING(for aqbanking libs)
- aqbanking_libs="`$aqbanking_dir/bin/aqbanking-config --libraries`"
+ aqbanking_libs="`pkg-config --libs aqbanking`"
AC_MSG_RESULT($aqbanking_libs)
AC_MSG_CHECKING(for aqbanking C++ libs)
- aqbanking_libspp="`$aqbanking_dir/bin/aqbanking-config --libraries++`"
+ aqbanking_libspp="`pkg-config --libs aqbanking++`"
AC_MSG_RESULT($aqbanking_libspp)
AC_MSG_CHECKING(for aqbanking includes)
- aqbanking_includes="`$aqbanking_dir/bin/aqbanking-config --includes`"
+ aqbanking_includes="`pkg-config --cflags aqbanking`"
AC_MSG_RESULT($aqbanking_includes)
AC_MSG_CHECKING(for aqbanking plugins)
- aqbanking_plugins="`$aqbanking_dir/bin/aqbanking-config --plugins`"
+ aqbanking_plugins="`pkg-config --variable=plugindir aqbanking`"
AC_MSG_RESULT($aqbanking_plugins)
AC_MSG_CHECKING(for aqbanking data)
- aqbanking_data="`$aqbanking_dir/bin/aqbanking-config --data`"
+ aqbanking_data="`pkg-config --variable=pkgdatadir aqbanking`"
AC_MSG_RESULT($aqbanking_data)
fi
AC_MSG_CHECKING(if aqbanking test desired)
@@ -88,27 +88,9 @@
AC_MSG_RESULT($enable_aqbanking_test)
AC_MSG_CHECKING(for AqBanking version >=$vma.$vmi.$vpl.$vbld)
if test "$enable_aqbanking_test" != "no"; then
- aqbanking_versionstring="`$aqbanking_dir/bin/aqbanking-config --vstring`.`$aqbanking_dir/bin/aqbanking-config --vbuild`"
- AC_MSG_RESULT([found $aqbanking_versionstring])
- if test "$vma" -gt "`$aqbanking_dir/bin/aqbanking-config --vmajor`"; then
- AC_MSG_ERROR([Your AqBanking version is way too old.
- Please update from http://www.aquamaniac.de/aqbanking/])
- elif test "$vma" = "`$aqbanking_dir/bin/aqbanking-config --vmajor`"; then
- if test "$vmi" -gt "`$aqbanking_dir/bin/aqbanking-config --vminor`"; then
- AC_MSG_ERROR([Your AqBanking version is too old.
- Please update from http://www.aquamaniac.de/aqbanking/])
- elif test "$vmi" = "`$aqbanking_dir/bin/aqbanking-config --vminor`"; then
- if test "$vpl" -gt "`$aqbanking_dir/bin/aqbanking-config --vpatchlevel`"; then
- AC_MSG_ERROR([Your AqBanking version is a little bit too old.
- Please update from http://www.aquamaniac.de/aqbanking/])
- elif test "$vpl" = "`$aqbanking_dir/bin/aqbanking-config --vpatchlevel`"; then
- if test "$vbld" -gt "`$aqbanking_dir/bin/aqbanking-config --vbuild`"; then
- AC_MSG_ERROR([Your AqBanking version is a little bit too old.
- Please update to the latest CVS version. Instructions for accessing
- CVS can be found on http://www.aquamaniac.de/aqbanking/])
- fi
- fi
- fi
+ if ! pkg-config --atleast-version $vma.$vmi.$vpl.$vbld aqbanking; then
+ AC_MSG_ERROR([Your AqBanking version is too old.
+ Please update from http://www.aquamaniac.de/aqbanking/])
fi
have_aqbanking="yes"
#AC_MSG_RESULT(yes)
gnucash-gmemchunk.patch:
guid.c | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE gnucash-gmemchunk.patch ---
--- gnucash/lib/libqof/qof/guid.c.foo 2005-12-22 17:13:33.000000000 -0500
+++ gnucash/lib/libqof/qof/guid.c 2005-12-22 17:17:02.000000000 -0500
@@ -27,6 +27,8 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+/* fix for glib-2.10 */
+#undef G_DISABLE_DEPRECATED
#include <sys/types.h>
#include <ctype.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- .cvsignore 9 Feb 2005 20:09:09 -0000 1.12
+++ .cvsignore 7 Jan 2006 04:21:21 -0000 1.12.2.1
@@ -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
gnucash-1.8.6-64bit-fixes.patch:
gnc-html.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: gnucash-1.8.6-64bit-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash-1.8.6-64bit-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- gnucash-1.8.6-64bit-fixes.patch 9 Sep 2004 05:47:58 -0000 1.1
+++ gnucash-1.8.6-64bit-fixes.patch 7 Jan 2006 04:21:21 -0000 1.1.2.1
@@ -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
Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- gnucash.spec 9 Dec 2005 22:40:46 -0000 1.18
+++ gnucash.spec 7 Jan 2006 04:21:21 -0000 1.18.2.1
@@ -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 @@
(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 @@
%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 @@
$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 @@
/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 @@
%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 <notting at redhat.com> 1.9.0-0.12168.1
+- update to 2.x branch
+
+* Thu Dec 22 2005 Bill Nottingham <notting at redhat.com> 1.8.12-1
+- update to 1.8.12
+
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- sources 9 Feb 2005 20:09:09 -0000 1.12
+++ sources 7 Jan 2006 04:21:21 -0000 1.12.2.1
@@ -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
More information about the fedora-cvs-commits
mailing list