rpms/gnucash/devel .cvsignore, 1.12, 1.13 gnucash.spec, 1.25, 1.26 sources, 1.13, 1.14

Mon Mar 27 21:11:57 UTC 2006

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv830

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
merge the g2 changes. update to 1.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13

--- .cvsignore	9 Feb 2005 20:09:09 -0000	1.12
+++ .cvsignore	27 Mar 2006 21:11:55 -0000	1.13
@@ -1,2 +1,4 @@
-gnucash-1.8.11.tar.gz
-gnucash-docs-1.8.5.tar.gz
+gnucash-1.9.1.svn13429.tar.bz2
+gnucash-docs-1.9.1.svn13429.tar.bz2
+gnucash-1.9.3.tar.gz
+gnucash-docs-1.9.3.svn13703.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnucash.spec	20 Feb 2006 20:14:09 -0000	1.25
+++ gnucash.spec	27 Mar 2006 21:11:55 -0000	1.26
@@ -1,24 +1,35 @@
-%define docver 1.8.5
+%define svnrev 13703
+
+%define buildsvn 1
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.8.12
-Release: 3
+Version: 1.9.3
+%if %{buildsvn}
+Release: 1.svn%{svnrev}.1
+%else
+Release: 1
+%endif
 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
+%if %{buildsvn}
+Source: gnucash-%{version}.svn%{svnrev}.tar.bz2
+Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2
+%else
+Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/gnucash-%{version}.tar.gz
+#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/gnucash-docs-%{docver}.tar.gz
+Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2
+%endif
 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, autoconf
-BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl
-BuildPrereq: libtool-ltdl-devel, GConf-devel
-BuildRequires: desktop-file-utils, scrollkeeper
+BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
+BuildRequires: libgsf-devel >= 1.12.2
+# cairo-devel >= 0.5.0
+BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
+BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
+BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
 Requires: slib >= 3a1-5
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
 %define __perl_requires  %{nil}
@@ -32,21 +43,29 @@
 balanced books.
 
 %prep
+%if %{buildsvn}
+%setup -q -a 1 -n gnucash
+%else
 %setup -q -a 1
-%patch3 -p1 -b .icon
+%endif
+
+#%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
-%patch5 -p1 -b .aq
+#%patch5 -p1 -b .aq
 
 %build
-autoconf
+%if %{buildsvn}
+./autogen.sh
+%endif
 %configure --disable-sql --enable-error-on-warning=no \
 	--enable-ofx \
-	--enable-hbci
+	--enable-hbci \
+#	--with-cairo \
 
 make LIBTOOL=/usr/bin/libtool CC=gcc
 
-cd gnucash-docs-%{docver}
-autoconf-2.13
+cd gnucash-docs
+./autogen.sh --prefix=/usr
 %configure
 make
 
@@ -57,7 +76,7 @@
 
 %find_lang %{name}
 
-cd gnucash-docs-%{docver}
+cd gnucash-docs
 make install DESTDIR=$RPM_BUILD_ROOT || :
 
 # vfolder desktop file install stuff
@@ -67,7 +86,7 @@
   --add-category X-Red-Hat-Extra                      \
   --add-category Application                         \
   --add-category Office                               \
-  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gnucash.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop
 echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop
 
 rm -rf $RPM_BUILD_ROOT/%{_infodir} \
@@ -75,7 +94,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
@@ -84,28 +105,40 @@
 /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
+%{_datadir}/xml/*
 %{_datadir}/gnucash
 %{_datadir}/gnome/help/gnucash
 %{_datadir}/mime-info/gnucash.*
 %{_datadir}/omf/gnucash-docs
-%{_datadir}/pixmaps/gnucash
 %{_datadir}/applications/*
 %{_mandir}/man*/*
 %config %{_sysconfdir}/gnucash
-%doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches
+%doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Mar 27 2006 Bill Nottingham <notting at redhat.com> - 1.9.3-1
+- update to 1.9.x
+
 * Mon Feb 20 2006 Bill Nottingham <notting at redhat.com> - 1.8.12-3
 - rebuild against g-wrap-1.9.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2005 21:42:37 -0000	1.13
+++ sources	27 Mar 2006 21:11:55 -0000	1.14
@@ -1,2 +1,2 @@
-81e7c703db56bb203e106664157779cc  gnucash-1.8.12.tar.gz
-9758d8e523530c2509912761e327a9d5  gnucash-docs-1.8.5.tar.gz
+00841051fe0a68547178765148f319aa  gnucash-1.9.3.tar.gz
+c507275cde120fb23ff03aac8d81ee89  gnucash-docs-1.9.3.svn13703.tar.bz2


