rpms/aqbanking/F-13 aqbanking.spec,1.63,1.64

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/aqbanking/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23440

Modified Files:
	aqbanking.spec 
Log Message:
* Fri Mar 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
- q4banking(-devel) pkgs (#571575)
- better versioned g2banking/kbanking Obsoletes



Index: aqbanking.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-13/aqbanking.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- aqbanking.spec	8 Mar 2010 21:21:09 -0000	1.63
+++ aqbanking.spec	19 Mar 2010 17:38:18 -0000	1.64
@@ -8,7 +8,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export
 Version: 4.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
@@ -19,11 +19,10 @@ Patch3: aqbanking-2.1.0-conflict.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # qbanking
 BuildRequires: %{qt3pkg}-devel
+BuildRequires: qt4-devel
 BuildRequires: gwenhywfar-devel >= 3.10.0, gmp-devel, gettext, 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 
@@ -45,20 +44,18 @@ Requires: pkgconfig
 # for %{_datadir}/aclocal
 Requires: automake
 Obsoletes: aqhbci-devel <= 1.0.3
-Obsoletes: g2banking-devel < %{version}
+Obsoletes: g2banking-devel < 3.7.2-1 
 
 %description devel
 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
-Requires(postun): /sbin/ldconfig
 Obsoletes: aqhbci-qt-tools <= 1.0.3
-Obsoletes: kbanking < %{version}
+Obsoletes: kbanking < 3.7.2-1 
 
 %description -n qbanking
 This package contains the qbanking KDE bindings for the Aqbanking
@@ -70,12 +67,30 @@ Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: qbanking = %{version}-%{release}
 Requires: %{qt3pkg}-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}
+%{?_qt4_version: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}.
+
+
 %prep
 %setup -q
 %patch2 -p1 -b .pkgconfig
@@ -83,7 +98,15 @@ compiling programs using the qbanking bi
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%{configure} --disable-static  --with-frontends="qbanking"
+
+%configure \
+  --disable-static \
+  --with-frontends="qbanking q4banking" \
+  --enable-qt4 \
+  --with-qt4-includes=%{_qt4_headerdir} \
+  --with-qt4-libs=%{_qt4_libdir} \
+  --with-qt4-moc=moc-qt4 \
+  --with-qt4-uic=uic-qt4
 
 make LIBTOOL=/usr/bin/libtool
 
@@ -117,47 +140,80 @@ 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
+%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}/*-tool4
+%{_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-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 q4banking
+%defattr(-,root,root)
+%{_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
+
+
 %changelog
+* Fri Mar 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
+- q4banking(-devel) pkgs (#571575)
+- better versioned g2banking/kbanking Obsoletes
+
 * Mon Mar  8 2010 Bill Nottingham <notting at redhat.com> - 4.2.4-1
 - update to latest upstream 4.2.4