update: aqbanking, gnucash

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1804 ec354946-7b23-47d6-9f5a-488ba84defc7

a/aqbanking/aqbanking-vl.spec

@@ -1,28 +1,40 @@
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.6.3)
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
+%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
+%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
+
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export
-Version: 3.7.2
+Version: 4.2.4
 Release: 1%{?_dist_release}
-Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
+
 Group: System Environment/Libraries
 License: GPLv2+
 URL: http://www.aquamaniac.de/aqbanking/
-Patch2: aqbanking-3.7.2-pkgconfig.patch
+
+Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
+
+Patch2: aqbanking-4.2.4-pkgconfig.patch
 Patch3: aqbanking-2.1.0-conflict.patch
+# upstreamable, omit inadvertant(?) qt3 linkage q4banking -- Rex
+Patch4: aqbanking-4.2.4-q4banking_remove_qt3.patch 
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # qbanking
 BuildRequires: qt-devel
-# python
-BuildRequires: python, PyXML, gmp-devel
-BuildRequires: gwenhywfar-devel >= 3.4.1
-BuildRequires: libofx-devel >= 0.9.0
+BuildRequires: qt4-devel
+BuildRequires: gwenhywfar-devel >= 3.10.0
+BuildRequires: gmp-devel
 BuildRequires: gettext
 BuildRequires: libtool
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes: aqhbci <= 1.0.3
-Obsoletes: g2banking < %{version}
+Obsoletes: g2banking < 3.7.2-1
+Obsoletes: python-aqbanking
 
 %description 
 The intention of AqBanking is to provide a middle layer between the
@@ -49,7 +61,7 @@ This package contains aqbanking-config and header files for writing and
 compiling programs using Aqbanking.
 
 %package -n qbanking
-Summary: Qt bindings for Aqbanking
+Summary: Qt3 bindings for Aqbanking
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/ldconfig
@@ -68,12 +80,31 @@ Requires: %{name}-devel = %{version}-%{release}
 Requires: qbanking = %{version}-%{release}
 Requires: pkgconfig
 Requires: qt-devel
-Obsoletes: kbanking-devel < %{version}
+Obsoletes: kbanking-devel < 3.7.2-1
 
 %description -n qbanking-devel
 This package contains qbanking-config and header files for writing and
 compiling programs using the qbanking bindings for Aqbanking.
 
+%package -n q4banking
+Summary: Qt4 bindings for Aqbanking
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4 >= %{_qt4_version}
+
+%description -n q4banking
+%{summary}.
+
+%package -n q4banking-devel
+Summary: Development files for q4banking
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: q4banking = %{version}-%{release}
+Requires: qt4-devel
+
+%description -n q4banking-devel
+%{summary}.
+
 %package -n python-%{name}
 Summary: Python bindings for Aqbanking
 Group: Development/Libraries
@@ -86,20 +117,35 @@ This package contains python bindings for Aqbanking.
 %setup -q
 %patch2 -p1 -b .pkgconfig
 %patch3 -p1 -b .conflict
+%patch4 -p1 -b .q4banking_remove_qt3
+
+# hack to nuke rpaths, slighly less ugly than using overriding LIBTOOL below
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%{configure} --disable-static \
-  --with-kde3-libs=%{_libdir} \
-  --enable-libofx \
-  --enable-python
 
-make LIBTOOL=/usr/bin/libtool
+%configure \
+    --disable-static \
+    --with-frontends="qbanking q4banking" \
+    --enable-qt4 \
+    --with-qt4-includes=%{_qt4_headerdir} \
+    --with-qt4-libs=%{_qt4_libdir} \
+    --with-qt4-moc=%{_qt4_prefix}/bin/moc \
+    --with-qt4-uic=%{_qt4_prefix}/bin/uic
+
+# not smp_mflags safe
+# override LIBTOOL to quash rpath
+make 
+#make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
+make DESTDIR=$RPM_BUILD_ROOT install
+#make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name *.a -exec rm -f {} \;
@@ -107,13 +153,19 @@ find $RPM_BUILD_ROOT -name *.a -exec rm -f {} \;
 cd tutorials
 make clean
 rm -rf .deps
+rm -f Makefile*
 cd ..
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 mv $RPM_BUILD_ROOT/%{_datadir}/doc/{aqbanking,aqhbci} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
-mv AUTHORS README COPYING ChangeLog NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+cp AUTHORS README COPYING ChangeLog NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+
 %find_lang %{name}
 
+# Fix multilib errors. (#602879)
+sed -i 's|** Created:.*|** Created |g' $RPM_BUILD_ROOT/%{_includedir}/q4banking/*.ui.h
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -125,50 +177,83 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -n qbanking -p /sbin/ldconfig
 
+%post -n q4banking -p /sbin/ldconfig
+
+%postun -n q4banking -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc %{_datadir}/doc/%{name}-%{version}
 %{_libdir}/libaq*.so.*
-%{_libdir}/aqbanking
-%exclude %{_libdir}/aqbanking/plugins/*/debugger
-%exclude %{_libdir}/aqbanking/plugins/*/frontends/qbanking
-%exclude %{_libdir}/aqbanking/plugins/*/wizards
-%{_libdir}/gwenhywfar/*
-%{_datadir}/aqbanking
-%exclude %{_datadir}/aqbanking/frontends/*
-%exclude %{_datadir}/aqbanking/i18n
-%{_bindir}/*-tool3
+%dir %{_libdir}/aqbanking
+%dir %{_libdir}/aqbanking/plugins/
+%dir %{_libdir}/aqbanking/plugins/*/
+%dir %{_libdir}/aqbanking/plugins/*/debugger/
+%dir %{_libdir}/aqbanking/plugins/*/debugger/*/
+%dir %{_libdir}/aqbanking/plugins/*/frontends/
+%{_libdir}/aqbanking/plugins/*/bankinfo/
+%{_libdir}/aqbanking/plugins/*/imexporters/
+%{_libdir}/aqbanking/plugins/*/providers/
+%{_libdir}/gwenhywfar/plugins/*/dbio/*
+%dir %{_datadir}/aqbanking
+%dir %{_datadir}/aqbanking/frontends
+%{_datadir}/aqbanking/backends/
+%{_datadir}/aqbanking/bankinfo/
+%{_datadir}/aqbanking/imexporters/
+%{_bindir}/aqbanking-cli
+%{_bindir}/aqhbci-tool4
 
 %files devel
 %defattr(-,root,root)
 %doc doc/0[12]* tutorials
 %{_bindir}/hbcixml3
-%{_bindir}/aq*-config
+%{_bindir}/aqbanking-config
 %{_libdir}/libaq*.so
-%{_includedir}/aq*
-%{_libdir}/pkgconfig/*
-%{_datadir}/aclocal/aq*
+%{_includedir}/aq*/
+%{_libdir}/pkgconfig/aqbanking.pc
+%{_datadir}/aclocal/aqbanking.m4
 
 %files -n qbanking
 %defattr(-,root,root)
-%{_bindir}/qb-help5
+%{_bindir}/qb-help8
 %{_libdir}/libqbanking.so.*
-%{_libdir}/aqbanking/plugins/*/debugger
+%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/aqhbci-qt3-debug
+%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/qt_debug.xml
 %{_libdir}/aqbanking/plugins/*/frontends/qbanking
-%{_libdir}/aqbanking/plugins/*/wizards
+%{_libdir}/aqbanking/plugins/*/wizards/qt3*
 %{_datadir}/aqbanking/i18n
-%{_datadir}/aqbanking/frontends/qbanking
+%{_datadir}/aqbanking/frontends/qbanking/
 
 %files -n qbanking-devel
 %defattr(-,root,root)
-%{_includedir}/qbanking
+%{_includedir}/qbanking/
 %{_libdir}/libqbanking.so
 
-%files -n python-%{name}
+%files -n q4banking
 %defattr(-,root,root)
-%{python_sitelib}/%{name}
+%{_bindir}/q4b-help1
+%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/aqhbci-qt4-debug
+%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/qt4_debug.xml
+%{_libdir}/aqbanking/plugins/*/frontends/q4banking
+%{_libdir}/aqbanking/plugins/*/wizards/qt4*
+%{_datadir}/aqbanking/frontends/q4banking/
+%{_libdir}/libq4banking.so.1*
+
+%files -n q4banking-devel
+%defattr(-,root,root)
+%{_includedir}/q4banking/
+%{_libdir}/libq4banking.so
+
+#%files -n python-%{name}
+#%defattr(-,root,root)
+#%{python_sitelib}/%{name}
 
 %changelog
+* Mon Sep 13 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.2.4-1
+- update to 4.2.4
+- added q4banking subpackage
+- obsoletes python-aqbanking subpackage
+
 * Sat Oct 11 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.7.1-1
 - update to 3.7.2
 - obsolete the no-longer-existing g2banking/kbanking packages

g/gnucash/gnucash-vl.spec

@@ -1,23 +1,26 @@
 %define ver 2.2.9
 %define docver 2.2.0
-%define rel 2%{?_dist_release}
+%define rel 3%{?_dist_release}
 %define __libtoolize /bin/true
 %define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_import_qif.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas
 
 Name:      	gnucash
 Summary:   	GnuCash is an application to keep track of your finances.
-Summary(ja):	GnuCash -- 個人用財務管理アプリケーション
+Summary(ja):	個人用財務管理アプリケーション
 Version:   	%{ver}
 Release:  	%{rel}
+
 License: 	GPL/LGPL/GFDL
 Group:     	Applications/Productivity
 URL:            http://www.gnucash.org/
-Packager:       kenta, inagaki
+
 Source:    	%{name}-%{version}.tar.bz2
 Source1:        %{name}-docs-%{docver}.tar.gz
 Patch0:         gnucash-2.2.3-quiet.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
+Patch1:         gnucash-2.2.9-aqbanking4.patch
+Patch2:         gnucash-2.2.9-goffice.patch
 
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: aqbanking-devel >= 3.7.2
 BuildRequires: GConf2-devel
 BuildRequires: bzip2-devel
@@ -31,22 +34,24 @@ BuildRequires: libofx-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: libjpeg-devel
 BuildRequires: pcre-devel
+BuildRequires: popt-devel
 BuildRequires: swig
 BuildRequires: slib
 BuildRequires: gwenhywfar-devel
+BuildRequires: desktop-file-utils
 
-BuildPrereq:   desktop-file-utils
-Prereq:        GConf2
-Prereq:        scrollkeeper >= 0.3.4
-Prereq:        /sbin/ldconfig
-Prereq:        /sbin/install-info
 # for HBCI setup wizard
 Requires:      qbanking
 Requires:      slib
 Requires:      perl-DateManip
 Requires:      yelp
+Requires(pre,post,preun): GConf2
+Requires(post,postun): scrollkeeper >= 0.3.4
 Obsoletes:     gnucash-backend-postgres
 
+Packager:      kenta, inagaki
+
+
 %description
 GnuCash is a personal finance manager. A check-book like
 register GUI allows you to enter and track bank accounts,
@@ -63,6 +68,8 @@ GnuCashは 個人用財務管理をするアプリケーションです．
 %prep
 %setup -q -a 1
 %patch0 -p1 -b .quiet
+%patch1 -p0 -b .aqbanking4
+%patch2 -p0 -b .goffice08
 
 %build
 msgfmt -v po/ja.po -o po/ja.gmo
@@ -120,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
     for S in %{schemas}; do
-      gconftool-2 --makefile-uninstall-rule ${S} >/dev/null
+	gconftool-2 --makefile-uninstall-rule ${S} >/dev/null
     done
 fi
 
@@ -130,14 +137,14 @@ fi
 
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 for S in %{schemas}; do
-  gconftool-2 --makefile-install-rule ${S} >/dev/null
+    gconftool-2 --makefile-install-rule ${S} >/dev/null
 done
 
 %preun
 if [ "$1" -gt 0 ]; then
     export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
     for S in %{schemas}; do
-      gconftool-2 --makefile-uninstall-rule ${S} >/dev/null
+	gconftool-2 --makefile-uninstall-rule ${S} >/dev/null
     done
 fi
 
@@ -164,6 +171,11 @@ fi
 %doc doc/README.OFX
 
 %changelog
+* Tue Sep 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.9-3
+- rebuilt with new toolchain, aqbanking-4.2.4, goffice-0.8.10
+- added Patch1 for building with aqbanking-4.2.4
+- added Patch2 for building with goffice-0.8.10
+
 * Fri Jul 24 2009 NAKAMURA Kenta <kenta@vinelinux.org> 2.2.9-2
 - added slib to BuildRequires: and Requires: