From 9aa916d68579c37967b82e6fbeaed5996f8880187c7f1b0e636b436ecfd19afd Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Feb 2014 13:44:31 +0000 Subject: [PATCH] Accepting request 222661 from X11:common:Factory Update to 4.10.0beta and integration of changes from home:j-engel:banking (forwarded request 221541 from j-engel) OBS-URL: https://build.opensuse.org/request/show/222661 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gwenhywfar?expand=0&rev=47 --- gwenhywfar-4.10.0beta.tar.gz | 3 + gwenhywfar-4.9.0beta.tar.gz | 3 - gwenhywfar.changes | 9 +++ gwenhywfar.spec | 119 ++++++++++++++++++++++++----------- 4 files changed, 93 insertions(+), 41 deletions(-) create mode 100644 gwenhywfar-4.10.0beta.tar.gz delete mode 100644 gwenhywfar-4.9.0beta.tar.gz diff --git a/gwenhywfar-4.10.0beta.tar.gz b/gwenhywfar-4.10.0beta.tar.gz new file mode 100644 index 0000000..a4c426c --- /dev/null +++ b/gwenhywfar-4.10.0beta.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eed4bea07549ddecb0ded107b027385511c6304fcf78412804a4bc6184160fc6 +size 2438778 diff --git a/gwenhywfar-4.9.0beta.tar.gz b/gwenhywfar-4.9.0beta.tar.gz deleted file mode 100644 index eb8117b..0000000 --- a/gwenhywfar-4.9.0beta.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5e3c19ac5d8e73cbb1a3689cc70eaf5178ff15a37501e62a627aed2a4186f8e -size 2437922 diff --git a/gwenhywfar.changes b/gwenhywfar.changes index 3b3aa78..8d82135 100644 --- a/gwenhywfar.changes +++ b/gwenhywfar.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Feb 9 19:55:20 UTC 2014 - jcnengel@gmail.com + +- Update to version 4.10.0beta + + Add functions for individual plugin paths for other libraries +- Create Fox16 GUI +- Move documentation to separate package to enable multi-version + coexistence of the library + ------------------------------------------------------------------- Mon Jan 6 21:31:06 UTC 2014 - nico.kruber@gmail.com diff --git a/gwenhywfar.spec b/gwenhywfar.spec index 742ec18..f0998bf 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -16,26 +16,32 @@ # +%define libversion 60 Name: gwenhywfar -Version: 4.9.0beta +Version: 4.10.0beta Release: 0 -Summary: Multiplatform Helper Library for Other Libraries +Summary: Multiplatform helper library for other libraries License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries Url: http://www.aqbanking.de/ Source: %{name}-%{version}.tar.gz -#Source: http://www.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-4.9.0beta.tar.gz BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: gnutls-devel -BuildRequires: gtk2-devel -BuildRequires: libgcrypt-devel +BuildRequires: gnutls-devel >= 3.0 +BuildRequires: gtk2-devel >= 1.4 +BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libopenssl-devel BuildRequires: libqt4-devel +%if 0%{?fedora} == 15 +BuildRequires: fox-devel >= 1.6 +%else +BuildRequires: fox16-devel +%endif # For doc graphs BuildRequires: graphviz BuildRequires: graphviz-gd BuildRequires: xorg-x11-fonts +Recommends: lib%{name}%{libversion} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,35 +64,41 @@ some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). -%package -n libgwenhywfar60-plugins +%package -n lib%{name}%{libversion}-plugins Summary: Multiplatform Helper Library for Other Libraries - Plugins License: LGPL-2.1+ Group: System/Libraries Requires: %{name} = %{version} -%description -n libgwenhywfar60-plugins +%description -n lib%{name}%{libversion}-plugins Gwenhywfar is a base library used to provide OS abstraction functions for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). -%package -n libgwenhywfar60 +%package -n lib%{name}%{libversion} Summary: Multiplatform Helper Library for Other Libraries License: LGPL-2.1+ Group: System/Libraries Recommends: %{name}-lang -# Needed to make lang package installable -Provides: %{name} = %{version} -Recommends: libgwenhywfar60-plugins = %{version} +Recommends: lib%{name}%{libversion}-plugins = %{version} -%description -n libgwenhywfar60 +%description -n lib%{name}%{libversion} Gwenhywfar is a base library used to provide OS abstraction functions for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). +%package -n libgwengui-cpp0 +Summary: C++ interface for Gwenhywfar +License: GPL-2.0+ and LGPL-2.1+ +Group: System/Libraries + +%description -n libgwengui-cpp0 +This package contains the C++ GUI interface for Gwenhywfar. + %package -n libgwengui-gtk2-0 Summary: Multiplatform Helper Library for Other Libraries -- GTK+ UI Backend License: LGPL-2.1+ @@ -115,14 +127,24 @@ communication). This package provides the Qt implementation of the generic UI toolkit. +%package -n libgwengui-fox16-0 +Summary: FOX interface for Gwenhywfar +License: GPL-2.0+ and LGPL-2.1+ +Group: System/Libraries + +%description -n libgwengui-fox16-0 +This package contains the interface to the FOX toolkit +for Gwenhywfar. + %package devel Summary: Multi-Platform Helper Library for Other Libraries License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: glibc-devel +Requires: lib%{name}%{libversion} = %{version} +Requires: libgwengui-fox16-0 = %{version} Requires: libgwengui-gtk2-0 = %{version} Requires: libgwengui-qt4-0 = %{version} -Requires: libgwenhywfar60 = %{version} %description devel Gwenhywfar is a base library used to provide OS abstraction functions @@ -139,10 +161,11 @@ communication etc). %configure\ --enable-release\ --enable-full-doc\ - --with-docpath=%{_datadir}/%{name}/apidoc\ - --with-openssl-libs=%{_libdir} \ - --with-qt4-libs=%{_libdir} \ + --with-docpath=%{_docdir}/%{name}/api \ --disable-static \ + --with-qt4-libs=%{_libdir} \ + --with-guis="fox16 qt4 gtk2" \ + --with-plugins-cfgmgr=all \ --with-pic %__make %{?smp_mflags} %__make srcdoc %{?smp_mflags} @@ -150,7 +173,7 @@ communication etc). %install %makeinstall %makeinstall install-srcdoc -pushd %{buildroot}%{_datadir}/%{name}/apidoc +pushd %{buildroot}%{_docdir}/%{name}/api # we don't want another 'gwenhywfar' dir below docpath %__mv %{name}/* ./ rm -rf %{name} @@ -164,9 +187,13 @@ find %{buildroot} -type f -name "*.la" -delete -print %clean rm -rf %{buildroot} -%post -n libgwenhywfar60 -p /sbin/ldconfig +%post -n lib%{name}%{libversion} -p /sbin/ldconfig -%postun -n libgwenhywfar60 -p /sbin/ldconfig +%postun -n lib%{name}%{libversion} -p /sbin/ldconfig + +%post -n libgwengui-cpp0 -p /sbin/ldconfig + +%postun -n libgwengui-cpp0 -p /sbin/ldconfig %post -n libgwengui-gtk2-0 -p /sbin/ldconfig @@ -176,6 +203,21 @@ rm -rf %{buildroot} %postun -n libgwengui-qt4-0 -p /sbin/ldconfig +%post -n libgwengui-fox16-0 -p /sbin/ldconfig + +%postun -n libgwengui-fox16-0 -p /sbin/ldconfig + +%files +%defattr (-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README TODO +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/ca-bundle.crt +%{_datadir}/%{name}/dialogs/ +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%dir %{_libdir}/%{name}/plugins/%{libversion} +%exclude %{_docdir}/%{name}/api + %files tools %defattr (-, root, root) %{_bindir}/gct-tool @@ -184,23 +226,19 @@ rm -rf %{buildroot} %{_bindir}/typemaker %{_bindir}/typemaker2 %{_bindir}/xmlmerge -%{_datadir}/gwenhywfar/typemaker2/ +%{_datadir}/%{name}/typemaker2/ -%files -n libgwenhywfar60-plugins +%files -n lib%{name}%{libversion}-plugins %defattr (-, root, root) -%{_libdir}/gwenhywfar/plugins/60/* +%{_libdir}/%{name}/plugins/%{libversion}/* -%files -n libgwenhywfar60 -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO -%{_libdir}/libgwenhywfar.so.* +%files -n lib%{name}%{libversion} +%defattr (-,root,root) +%{_libdir}/lib%{name}.so.* + +%files -n libgwengui-cpp0 +%defattr (-,root,root) %{_libdir}/libgwengui-cpp.so.* -%dir %{_datadir}/gwenhywfar/ -%{_datadir}/gwenhywfar/ca-bundle.crt -%{_datadir}/gwenhywfar/dialogs/ -%dir %{_libdir}/gwenhywfar -%dir %{_libdir}/gwenhywfar/plugins -%dir %{_libdir}/gwenhywfar/plugins/60 %files -n libgwengui-gtk2-0 %defattr (-, root, root) @@ -210,17 +248,22 @@ rm -rf %{buildroot} %defattr (-, root, root) %{_libdir}/libgwengui-qt4.so.* +%files -n libgwengui-fox16-0 +%defattr (-,root,root) +%{_libdir}/libgwengui-fox16.so.* + %files devel %defattr (-, root, root) -%{_bindir}/gwenhywfar-config +%{_bindir}/%{name}-config %dir %{_datadir}/aclocal -%{_datadir}/aclocal/gwenhywfar.m4 -%doc %{_datadir}/gwenhywfar/apidoc/ -%{_includedir}/gwenhywfar4/ +%{_datadir}/aclocal/%{name}.m4 +%doc %{_docdir}/%{name}/api/ +%{_includedir}/%{name}4/ %{_libdir}/*.so -%{_libdir}/pkgconfig/gwenhywfar.pc +%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/gwengui-gtk2.pc %{_libdir}/pkgconfig/gwengui-qt4.pc +%{_libdir}/pkgconfig/gwengui-fox16.pc %files lang -f %{name}.lang