- removed outdated am15,ignore_db1,libxml_includes_dir,guile_1_4_1 patches

[packages/gnucash.git] / gnucash.spec

diff --git a/gnucash.spec b/gnucash.spec
index aaba5449735e5dcb226c8bf68b1531ca20a2c4f7..29ab853913cb8a4bfaea0284c84c6f93984be0ef 100644 (file)
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -14,11 +14,7 @@ Group:               X11/Applications
 Source0:       http://www.gnucash.org/pub/gnucash/sources/stable/%{name}-%{version}.tar.gz
 # Source0-md5: 62f94331936e37ed1b1d28b5a1863bb3
 Source1:       %{name}-icon.png
-Patch0:                %{name}-info.patch
-Patch1:                %{name}-am15.patch
-Patch2:                %{name}-ignore_db1.patch
-Patch3:                %{name}-libxml_includes_dir.patch
-Patch4:                %{name}-guile_1_4_1.patch
+Patch1:                %{name}-types.patch
 URL:           http://www.gnucash.org/
 BuildRequires: GConf-devel
 BuildRequires: Guppi-devel >= 0.35.5
@@ -29,11 +25,10 @@ BuildRequires:      db-devel
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: g-wrap-devel >= 1.3.4
 BuildRequires: gal1-devel
-BuildRequires: gdk-pixbuf-devel
-BuildRequires: gdk-pixbuf-gnome-devel
+BuildRequires: gdk-pixbuf-gnome-devel >= 0.2.5
 BuildRequires: gettext-devel
 BuildRequires: gnome-libs-devel
-BuildRequires: gnome-print-devel
+BuildRequires: gnome-print-devel >= 0.21
 BuildRequires: gtk+-devel
 BuildRequires: gtkhtml1-devel >= 1.1
 BuildRequires: guile-devel >= 1.3.4
@@ -45,6 +40,7 @@ BuildRequires:        libtool
 BuildRequires: libxml-devel
 BuildRequires: openhbci-devel
 BuildRequires: pkgconfig
+BuildRequires: popt-devel
 BuildRequires: slib >= 2c4
 BuildRequires: texinfo
 Requires(post,preun):  /sbin/ldconfig
@@ -54,8 +50,6 @@ Requires:     perl
 Requires:      slib >= 2c4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/X11
-
 %description
 GnuCash is a personal finance manager. A check-book like register GUI
 allows you to enter and track bank accounts, stocks, income and even
@@ -86,23 +80,22 @@ livros balanceados.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
+%patch1 -p1
+
+# kill outdated libtool macros
+tail -n +3907 acinclude.m4 > acinclude.tmp
+mv -f acinclude.tmp acinclude.m4
 
 %build
-#rm -f missing src/guile/Makefile.in
-#%{__libtoolize}
-#%{__aclocal} -I %{_aclocaldir}/gnome
-#%{__autoconf}
-#%{__automake}
-
-#export CPPFLAGS="%{rpmcflags} -I%{_prefix}/include"
-%configure2_13 \
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I %{_aclocaldir}/gnome -I macros
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+
+%configure \
        --disable-prefer-db1
-#      --enable-hbci
-#      --enable-ofx
 
 %{__make}
 
@@ -112,10 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        GNC_DOC_INSTALL_DIR=%{_docdir}/%{name}-%{version}/ \
-       gnomeappdir=%{_applnkdir}/Office/Misc
+       gnomeappdir=%{_desktopdir}
 
 perl -pi -e 's/=gnome-money.png/=gnucash-icon.png/' \
-       $RPM_BUILD_ROOT%{_applnkdir}/Office/Misc/gnucash.desktop
+       $RPM_BUILD_ROOT%{_desktopdir}/gnucash.desktop
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
 
@@ -167,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %{_datadir}/gnucash/accounts/sk
 %lang(tr_TR) %{_datadir}/gnucash/accounts/tr_TR
 %{_datadir}/mime-info/*
-%{_applnkdir}/Office/Misc/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/%{name}
 %{_pixmapsdir}/%{name}-icon.png
 %{_mandir}/*/*