- starting update to 2.3.2

- removed link, glade and libsufix patches
- added nobash patch (fix syntax for /bin/sh)
- added backed-aqnone
- force -j1 for make
- release 0.1

Changed files:
    aqbanking.spec -> 1.13

diff --git a/aqbanking.spec b/aqbanking.spec
index 9da642e4e3f799b97edc40f93f880465d8b3fa33..e254390e1e9bb5e9f19165369b42be00bf9dcd67 100644 (file)
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -1,35 +1,41 @@
 #
+# TODO:
+# - fix building without chipcard (aclocal fail)
+# - add aqbanking-backend-aqnone-devel and aqbanking-backend-aqnone-static subpackages
+#
 # Conditional build:
-%bcond_with    chipcard        # aqgeldkarte backend
+%bcond_without chipcard        # aqgeldkarte backend
 %bcond_without gtk             # g2banking frontend
 %bcond_without kde             # kbanking frontend
 #
 Summary:       A library for online banking functions and financial data import/export
 Summary(pl.UTF-8):     Biblioteka do funkcji bankowych online oraz importu/eksportu danych finansowych
 Name:          aqbanking
-Version:       1.6.2
-Release:       2
+Version:       2.3.2
+Release:       0.1
 License:       GPL v2
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
-# Source0-md5: cb8337cf12072a304217379b7ea23df2
+# Source0-md5: ae34fc0c0e8f3b92728c4c6a36cc7697
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-glade.patch
-Patch2:                %{name}-libsuffix.patch
+Patch1:                %{name}-nobash.patch
+#Patch2:               %{name}-libsuffix.patch
 URL:           http://www.aquamaniac.de/aqbanking/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: gwenhywfar-devel >= 1.18.0
-%{?with_gtk:BuildRequires:     gtk+2-devel >= 2.0.0}
+BuildRequires: gwenhywfar-devel >= 2.3.0
+%if %{with gtk}
+BuildRequires: gtk+2-devel >= 2.0.0
+BuildRequires: libglade2 >= 2.0.0
+%endif
 %{?with_kde:BuildRequires:     kdelibs-devel >= 3.0}
 BuildRequires: ktoblzcheck-devel
-%{?with_chipcard:BuildRequires:        libchipcard2-devel >= 1.9.15}
+%{?with_chipcard:BuildRequires:        libchipcard3-devel >= 3.0.0}
 BuildRequires: libofx-devel >= 0.8.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
-BuildRequires: python-ctypes
-BuildRequires: python-devel >= 1:2.3
+BuildRequires: python-devel >= 1:2.5
 BuildRequires: rpm-pythonprov
 BuildRequires: qt-devel >= 1:3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,6 +87,18 @@ Static AqBanking libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki AqBanking.
 
+%package backend-aqnone
+Summary:       Aqnone backend for AqBanking library
+Summary(pl.UTF-8):     Backend Aqnone dla biblioteki AqBanking
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description backend-aqnone
+Aqnone backend for AqBanking library.
+
+%description backend-aqnone -l pl.UTF-8
+Backend Aqnone dla biblioteki AqBanking.
+
 %package backend-aqdtaus
 Summary:       AqDTAUS backend for AqBanking library
 Summary(pl.UTF-8):     Backend AqDTAUS dla biblioteki AqBanking
@@ -397,9 +415,9 @@ Wiązanie Pythona do biblioteki AqBanking.
 
 %prep
 %setup -q
-%patch0 -p1
+#patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#patch2 -p1
 
 %build
 %{__libtoolize}
@@ -409,18 +427,20 @@ Wiązanie Pythona do biblioteki AqBanking.
 %{__automake}
 %configure \
        %{!?with_kde:--disable-kde3} \
+       %{?with_kde:--with-kde3-libs=%{_libdir}} \
+       --with-qt3-libs=%{_libdir} \
        --enable-libofx \
        --enable-python \
        --enable-static \
        --with-backends="aqhbci aqdtaus%{?with_chipcard: aqgeldkarte} aqofxconnect" \
        --with-frontends="cbanking%{?with_gtk: g2banking} qbanking%{?with_kde: kbanking}"
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} install -j1 \
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*/plugins/*/*/*.{la,a}
@@ -462,7 +482,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog ChangeLog README TODO
 %attr(755,root,root) %{_libdir}/libaqbanking.so.*.*.*
-%attr(755,root,root) %{_libdir}/libaqbankingpp.so.*.*.*
 %dir %{_libdir}/aqbanking
 %dir %{_libdir}/aqbanking/plugins
 %dir %{_libdir}/aqbanking/plugins/*
@@ -470,11 +489,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/bankinfo/*.so*
 %{_libdir}/aqbanking/plugins/*/bankinfo/*.xml
 %dir %{_libdir}/aqbanking/plugins/*/debugger
+%dir %{_libdir}/aqbanking/plugins/*/frontends
+%dir %{_libdir}/aqbanking/plugins/*/frontends/qbanking
+%dir %{_libdir}/aqbanking/plugins/*/frontends/qbanking/cfgmodules
 %dir %{_libdir}/aqbanking/plugins/*/imexporters
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/imexporters/*.so*
 %{_libdir}/aqbanking/plugins/*/imexporters/*.xml
 %dir %{_libdir}/aqbanking/plugins/*/providers
 %dir %{_libdir}/aqbanking/plugins/*/wizards
+%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/qt3-wizard
+%{_libdir}/aqbanking/plugins/*/wizards/qt3_wizard.xml
 %attr(755,root,root) %{_libdir}/gwenhywfar/plugins/*/dbio/*.so*
 %{_libdir}/gwenhywfar/plugins/*/dbio/*.xml
 %{_datadir}/aqbanking
@@ -483,27 +507,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/aqbanking-config
 %attr(755,root,root) %{_libdir}/libaqbanking.so
-%attr(755,root,root) %{_libdir}/libaqbankingpp.so
 %{_libdir}/libaqbanking.la
-%{_libdir}/libaqbankingpp.la
 %{_includedir}/aqbanking
-%{_includedir}/aqbanking++
 %{_aclocaldir}/aqbanking.m4
 %{_pkgconfigdir}/aqbanking.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libaqbanking.a
-%{_libdir}/libaqbankingpp.a
+
+%files backend-aqnone
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libaqnone.so.*.*.*
+%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/providers/aqnone.so*
+%{_libdir}/aqbanking/plugins/*/providers/aqnone.xml
 
 %files backend-aqdtaus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libaqdtaus.so.*.*.*
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/providers/aqdtaus.so*
+%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/frontends/qbanking/cfgmodules/aqdtaus.so*
 %{_libdir}/aqbanking/plugins/*/providers/aqdtaus.xml
-%dir %{_libdir}/aqbanking/plugins/*/wizards/aqdtaus
-%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/aqdtaus/aqdtaus-qt3-wizard
-%{_libdir}/aqbanking/plugins/*/wizards/aqdtaus/qt_wizard.xml
 
 %files backend-aqdtaus-devel
 %defattr(644,root,root,755)
@@ -522,10 +546,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libaqgeldkarte.so.*.*.*
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/providers/aqgeldkarte.so*
+%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/frontends/qbanking/cfgmodules/aqgeldkarte.so*
 %{_libdir}/aqbanking/plugins/*/providers/aqgeldkarte.xml
-%dir %{_libdir}/aqbanking/plugins/*/wizards/aqgeldkarte
-%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/aqgeldkarte/aqgeldkarte-qt3-wizard
-%{_libdir}/aqbanking/plugins/*/wizards/aqgeldkarte/qt_wizard.xml
 
 %files backend-aqgeldkarte-devel
 %defattr(644,root,root,755)
@@ -549,10 +571,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/debugger/aqhbci/aqhbci-qt3-debug
 %{_libdir}/aqbanking/plugins/*/debugger/aqhbci/qt_debug.xml
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/providers/aqhbci.so*
+%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/frontends/qbanking/cfgmodules/aqhbci.so*
 %{_libdir}/aqbanking/plugins/*/providers/aqhbci.xml
-%dir %{_libdir}/aqbanking/plugins/*/wizards/aqhbci
-%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/aqhbci/aqhbci-qt3-wizard
-%{_libdir}/aqbanking/plugins/*/wizards/aqhbci/kde_wizard.xml
+#%dir %{_libdir}/aqbanking/plugins/*/wizards/aqhbci
+#%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/aqhbci/aqhbci-qt3-wizard
+#%{_libdir}/aqbanking/plugins/*/wizards/aqhbci/kde_wizard.xml
 %attr(755,root,root) %{_libdir}/gwenhywfar/plugins/*/crypttoken/pintan.so
 %{_libdir}/gwenhywfar/plugins/*/crypttoken/pintan.xml
 %{_datadir}/aqhbci
@@ -573,10 +596,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libaqofxconnect.so.*.*.*
 %attr(755,root,root) %{_libdir}/aqbanking/plugins/*/providers/aqofxconnect.so*
+%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/frontends/qbanking/cfgmodules/aqofxconnect.so*
 %{_libdir}/aqbanking/plugins/*/providers/aqofxconnect.xml
-%dir %{_libdir}/aqbanking/plugins/*/wizards/aqofxconnect
-%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/aqofxconnect/aqofxconnect-qt3-wizard
-%{_libdir}/aqbanking/plugins/*/wizards/aqofxconnect/qt_wizard.xml
+#%dir %{_libdir}/aqbanking/plugins/*/wizards/aqofxconnect
+#%attr(755,root,root) %{_libdir}/aqbanking/plugins/*/wizards/aqofxconnect/aqofxconnect-qt3-wizard
+#%{_libdir}/aqbanking/plugins/*/wizards/aqofxconnect/qt_wizard.xml
 
 %files backend-aqofxconnect-devel
 %defattr(644,root,root,755)
@@ -592,6 +616,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files frontend-cbanking
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cbanking-config
 %attr(755,root,root) %{_bindir}/aqbanking-tool
 %attr(755,root,root) %{_libdir}/libcbanking.so.*.*.*
 
@@ -600,6 +625,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libcbanking.so
 %{_libdir}/libcbanking.la
 %{_includedir}/cbanking
+%{_aclocaldir}/cbanking.m4
 
 %files frontend-cbanking-static
 %defattr(644,root,root,755)
@@ -643,6 +669,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files frontend-qbanking
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qb-help
 %attr(755,root,root) %{_libdir}/libqbanking.so.*.*.*
 
 %files frontend-qbanking-devel