diff --git a/gnucash.spec b/gnucash.spec index cf82415..1d99843 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -4,12 +4,13 @@ %define docver 2.0.1 Name: gnucash -Summary: GnuCash is an application to keep track of your finances. -Version: 2.0.2 +Summary: GnuCash is an application to keep track of your finances +Version: 2.0.4 +URL: http://gnucash.org/ %if %{buildsvn} -Release: 1%{?dist}.%{svnrev}svn.1 +Release: 2%{?dist}.%{svnrev}svn.1 %else -Release: 1%{?dist} +Release: 2%{?dist} %endif License: GPL/GFDL Group: Applications/Productivity @@ -20,13 +21,10 @@ Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2 Source1: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-docs-%{docver}.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 -Patch7: gnucash-1.9.5-guile18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel -BuildRequires: libgsf-devel >= 1.12.2 +BuildRequires: libgsf-devel >= 1.12.2, goffice-devel # cairo-devel >= 0.5.0 BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl @@ -36,7 +34,8 @@ Requires: slib >= 3a1-5, yelp # hack Requires: perl(Date::Manip) Requires: perl(Crypt::SSLeay) -Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4 +Requires(post): /sbin/ldconfig, scrollkeeper >= 0.3.4, GConf2 +Requires(postun): /sbin/ldconfig, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} Obsoletes: gnucash-backend-postgres @@ -54,10 +53,7 @@ balanced books. %setup -q -a 1 %endif -#%patch3 -p1 -b .icon %patch4 -p1 -b .64bit -#%patch5 -p1 -b .aq -#%patch7 -p1 -b .guile %build %if %{buildsvn} @@ -66,6 +62,7 @@ balanced books. %configure --disable-sql --enable-error-on-warning=no \ --enable-ofx \ --enable-hbci \ + --disable-static \ # --with-cairo \ make LIBTOOL=/usr/bin/libtool CC=gcc @@ -97,22 +94,25 @@ make install DESTDIR=$RPM_BUILD_ROOT || : # vfolder desktop file install stuff mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ desktop-file-install --vendor gnome --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Red-Hat-Extra \ - --add-category Application \ - --add-category Office \ - $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --delete-category Application \ + --add-category Office \ + $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop rm -rf $RPM_BUILD_ROOT/%{_infodir} \ - $RPM_BUILD_ROOT/%{_includedir} \ - $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/%{_datadir}/gnome/apps \ - $RPM_BUILD_ROOT/%{_libdir}/pkgconfig - + $RPM_BUILD_ROOT/%{_includedir} \ + $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/%{_datadir}/gnome/apps \ + $RPM_BUILD_ROOT/%{_libdir}/pkgconfig \ + $RPM_BUILD_ROOT/%{_bindir}/gnucash-config + +find $RPM_BUILD_ROOT/%{_libdir} -name *.so -a -type l -exec rm -f {} \; +chmod 644 $RPM_BUILD_ROOT/%{_datadir}/gnome/help/gnucash/C/custom.xml + %clean rm -rf $RPM_BUILD_ROOT @@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT 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_print_checks.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_scheduled_transctions.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 + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null done %postun @@ -146,11 +146,18 @@ done %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_mandir}/man*/* -%config %{_sysconfdir}/gnucash/* +%config(noreplace) %{_sysconfdir}/gnucash/* %doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Thu Jan 11 2007 Bill Nottingham - 2.0.4-2 +- build against separate goffice +- various spec cleanups + +* Mon Jan 8 2007 Bill Nottingham - 2.0.4-1 +- update to 2.0.4 + * Wed Oct 11 2006 Bill Nottingham - 2.0.2-1 - update to 2.0.2 - update docs to 2.0.1 diff --git a/sources b/sources index b80e552..77f1d9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -35da0a03d52a5913b75f6e7d717b58f0 gnucash-2.0.2.tar.bz2 ffc058efd0283a4b43ca31980c40db49 gnucash-docs-2.0.1.tar.bz2 +5755b05a3eaebab392fe9ad49073beb2 gnucash-2.0.4.tar.bz2 +41ee3f1369303c5282446778643f1f44 gnucash-2.0.3.tar.bz2