March 2014 - openSUSE Commits - openSUSE Mailing Lists

commit gmixer for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package gmixer for openSUSE:Factory checked in at 2014-03-31 20:42:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gmixer (Old) and /work/SRC/openSUSE:Factory/.gmixer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gmixer" Changes: -------- --- /work/SRC/openSUSE:Factory/gmixer/gmixer.changes 2011-09-23 02:00:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gmixer.new/gmixer.changes 2014-03-31 20:42:58.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Mar 25 19:53:25 UTC 2014 - trcs(a)gmx.com + +- added "Comment" in Spanish in gmixer.desktop +- modified gmixer-trayicon.desktop + * added "Comment" in Spanish + * added hack to kill the daemon before relaunching it again and + prevent multiple instances (e.g., after login out and login in + again) +- spec file cleanup + * removed checks for discontinued versions (<= 12.2) + * removed unneeded explicit Requires: python-xlib + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gmixer.spec ++++++ --- /var/tmp/diff_new_pack.AyURjS/_old 2014-03-31 20:42:59.000000000 +0200 +++ /var/tmp/diff_new_pack.AyURjS/_new 2014-03-31 20:42:59.000000000 +0200 @@ -15,12 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%if %suse_version <= 1110 -%define python_sitelib %py_sitedir -%define python_sitearch %py_sitedir -%endif Name: gmixer Version: 1.3 @@ -36,9 +30,14 @@ Patch1: gmixer-1.3-setup-py.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig -BuildRequires: gtk2-devel python-devel python-gtk-devel -BuildRequires: desktop-file-utils fdupes -Requires: python-gtk python-gstreamer-0_10 python-xlib +BuildRequires: gtk2-devel +BuildRequires: python-devel +BuildRequires: python-gtk-devel +BuildRequires: desktop-file-utils +BuildRequires: fdupes +Requires: python-gtk +Requires: python-gstreamer-0_10 + %{py_requires} %description @@ -49,7 +48,6 @@ - tray icon support - support special keys of multimedia keyboard. - %prep %setup -q %patch0 -p1 -b .version_fix @@ -81,14 +79,11 @@ %clean rm -rf $RPM_BUILD_ROOT -%if 0%{?suse_version} >= 1140 - %post %desktop_database_post %postun %desktop_database_postun -%endif %files -f %{name}.lang %defattr(-,root,root,-) ++++++ gmixer-trayicon.desktop ++++++ --- /var/tmp/diff_new_pack.AyURjS/_old 2014-03-31 20:42:59.000000000 +0200 +++ /var/tmp/diff_new_pack.AyURjS/_new 2014-03-31 20:42:59.000000000 +0200 @@ -3,9 +3,10 @@ Name=GMixer Comment=Audio mixer for the Gnome Desktop Environment Comment[de]=LautstÃ¤rkeregelung fÃ¼r den GNOME Desktop +Comment[es]=Mezclador de audio para el entorno de escritorio GNOME Comment[fr]=Mixer audio pour l'environnement Gnome Comment[it]=Mixer audio per l'ambiente destkop GNOME -Exec=gmixer -d +Exec=bash -c "killall gmixer; gmixer -d" Icon=gmixer StartupNotify=true Type=Application ++++++ gmixer.desktop ++++++ --- /var/tmp/diff_new_pack.AyURjS/_old 2014-03-31 20:42:59.000000000 +0200 +++ /var/tmp/diff_new_pack.AyURjS/_new 2014-03-31 20:42:59.000000000 +0200 @@ -3,6 +3,7 @@ Name=GMixer Comment=Audio mixer for the Gnome Desktop Environment Comment[de]=LautstÃ¤rkeregelung fÃ¼r den GNOME Desktop +Comment[es]=Mezclador de audio para el entorno de escritorio GNOME Comment[fr]=Mixer audio pour l'environnement Gnome Comment[it]=Mixer audio per l'ambiente desktop GNOME Exec=gmixer -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glpk for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package glpk for openSUSE:Factory checked in at 2014-03-31 20:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glpk (Old) and /work/SRC/openSUSE:Factory/.glpk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glpk" Changes: -------- --- /work/SRC/openSUSE:Factory/glpk/glpk.changes 2013-12-11 16:45:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glpk.new/glpk.changes 2014-03-31 20:42:52.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Mar 31 06:34:30 UTC 2014 - pgajdos(a)suse.com + +- updated to 4.54 + * Block-triangular LU-factorization was implemented to be used + on computing an initial factorization of the basis matrix. + * A new version of the Schur-complement-based factorization + module was included in the package. Now it can be used along + with plain as well as with block-triangular LU-factorization. + * The API routine glp_read_mps was changed to remove free rows. + * etc. see NEWS for details + +------------------------------------------------------------------- Old: ---- glpk-4.52.1.tar.gz glpk-4.52.1.tar.gz.sig New: ---- glpk-4.54.tar.gz glpk-4.54.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glpk.spec ++++++ --- /var/tmp/diff_new_pack.lCTLCC/_old 2014-03-31 20:42:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lCTLCC/_new 2014-03-31 20:42:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package glpk # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: glpk %define lname libglpk36 -Version: 4.52.1 +Version: 4.54 Release: 0 Summary: GNU Linear Programming Kit License: GPL-3.0 @@ -27,7 +27,7 @@ #DL-URL: http://ftp.gnu.org/gnu/glpk/ Source: http://ftp.gnu.org/gnu/glpk/%name-%version.tar.gz -Source2: http://ftp.gnu.org/gnu/glpk/%name-%version.tar.gz +Source2: http://ftp.gnu.org/gnu/glpk/%name-%version.tar.gz.sig Source3: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghostscript ++++++ glpk-4.52.1.tar.gz -> glpk-4.54.tar.gz ++++++ ++++ 34203 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit erlang for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2014-03-31 20:42:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "erlang" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2014-03-25 13:20:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2014-03-31 20:42:45.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Mar 27 18:09:29 UTC 2014 - matwey.kornilov(a)gmail.com + +- Invoking ./Install is not required. + +------------------------------------------------------------------- +Thu Mar 27 17:17:49 UTC 2014 - matwey.kornilov(a)gmail.com + +- Split EPMd to separate package in order to make it possible to + use alternative implementations of EPMd. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package erlang # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,10 +61,11 @@ BuildRequires: unixODBC-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel +BuildRequires: fdupes BuildRequires: java-devel >= 1.6.0 BuildRequires: krb5-devel BuildRequires: update-alternatives -BuildRequires: fdupes +Requires: erlang-epmd %if 0%{?suse_version} >= 1140 BuildRequires: wxWidgets @@ -118,6 +119,14 @@ %description doc Documentation for Erlang. +%package epmd +Summary: Erlang Port Mapper daemon +Group: Development/Languages/Other +Requires: %{name} = %{version} + +%description epmd +The Erlang Port Mapper daemon acts as a name server on all hosts involved in distributed Erlang computations. + %package et Summary: An event tracer for Erlang programs Group: Development/Languages/Other @@ -431,27 +440,26 @@ install -D -m 0644 %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.erlang install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang -%pre +%pre epmd /usr/sbin/groupadd -r epmd &>/dev/null || : /usr/sbin/useradd -g epmd -s /bin/false -r -c "Erlang Port Mapper Daemon" -d %{epmd_home} epmd &>/dev/null || : %if 0%{?have_systemd} %service_add_pre epmd.service epmd.socket %endif -%post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null +%post epmd %fillup_only erlang %if 0%{?have_systemd} %service_add_post epmd.service epmd.socket %endif -%preun +%preun epmd %if 0%{?have_systemd} %service_del_preun epmd.service epmd.socket %endif %stop_on_removal epmd -%postun +%postun epmd %if 0%{?have_systemd} %service_del_postun epmd.service epmd.socket %endif @@ -469,6 +477,7 @@ %doc %{_libdir}/erlang/COPYRIGHT %{_bindir}/* %exclude %{_bindir}/dialyzer +%exclude %{_bindir}/epmd %dir %{_libdir}/erlang %dir %{_libdir}/erlang/lib/ %exclude %{_libdir}/erlang/lib/*/src @@ -476,7 +485,10 @@ %exclude %{_libdir}/erlang/lib/*/java_src %{_libdir}/erlang/bin/ %exclude %{_libdir}/erlang/bin/dialyzer +%exclude %{_libdir}/erlang/bin/epmd %{_libdir}/erlang/erts-*/ +%exclude %{_libdir}/erlang/erts-*/bin/dialyzer +%exclude %{_libdir}/erlang/erts-*/bin/epmd %{_libdir}/erlang/lib/appmon-*/ %{_libdir}/erlang/lib/asn1-*/ %{_libdir}/erlang/lib/common_test-*/ @@ -527,14 +539,6 @@ %{_libdir}/erlang/usr/ %{_libdir}/erlang/Install %{_datadir}/emacs/site-lisp/erlang.el -%dir %attr(-,epmd,epmd) %{epmd_home} -%if 0%{?have_systemd} -%{_unitdir}/epmd.service -%{_unitdir}/epmd.socket -%endif -/etc/init.d/epmd -%{_sbindir}/rcepmd -/var/adm/fillup-templates/sysconfig.erlang %config %{_sysconfdir}/rpm/macros.erlang %files debugger @@ -548,6 +552,7 @@ %exclude %{_libdir}/erlang/lib/dialyzer-*/src %{_bindir}/dialyzer %{_libdir}/erlang/bin/dialyzer +%{_libdir}/erlang/erts-*/bin/dialyzer %files doc %defattr(0644,root,root,0755) @@ -558,6 +563,20 @@ %{_libdir}/erlang/lib/et-*/ %exclude %{_libdir}/erlang/lib/et-*/src +%files epmd +%defattr(-,root,root) +%{_bindir}/epmd +%{_libdir}/erlang/bin/epmd +%{_libdir}/erlang/erts-*/bin/epmd +%dir %attr(-,epmd,epmd) %{epmd_home} +%if 0%{?have_systemd} +%{_unitdir}/epmd.service +%{_unitdir}/epmd.socket +%endif +/etc/init.d/epmd +%{_sbindir}/rcepmd +/var/adm/fillup-templates/sysconfig.erlang + %files gs %defattr(-,root,root) %{_libdir}/erlang/lib/gs-*/ ++++++ 0001-Add-systemd-option-to-empd.-Check-for-include-system.patch ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -10,11 +10,11 @@ erts/epmd/src/epmd_int.h | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) -diff --git a/erts/configure.in b/erts/configure.in -index bad748d..6ba4c91 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -1563,6 +1563,8 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_enaddr], [], [], +Index: otp_src_R16B03/erts/configure.in +=================================================================== +--- otp_src_R16B03.orig/erts/configure.in ++++ otp_src_R16B03/erts/configure.in +@@ -1565,6 +1565,8 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_enadd #endif ]) @@ -23,10 +23,10 @@ dnl ---------------------------------------------------------------------- dnl Check the availability for libdlpi dnl ---------------------------------------------------------------------- -diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c -index 2d55b37..fc58882 100644 ---- a/erts/epmd/src/epmd.c -+++ b/erts/epmd/src/epmd.c +Index: otp_src_R16B03/erts/epmd/src/epmd.c +=================================================================== +--- otp_src_R16B03.orig/erts/epmd/src/epmd.c ++++ otp_src_R16B03/erts/epmd/src/epmd.c @@ -175,6 +175,9 @@ int main(int argc, char** argv) g->nodes.reg = g->nodes.unreg = g->nodes.unreg_tail = NULL; g->nodes.unreg_count = 0; @@ -64,10 +64,10 @@ epmd_cleanup_exit(g,1); } -diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h -index 656dbd1..bf1ddd8 100644 ---- a/erts/epmd/src/epmd_int.h -+++ b/erts/epmd/src/epmd_int.h +Index: otp_src_R16B03/erts/epmd/src/epmd_int.h +=================================================================== +--- otp_src_R16B03.orig/erts/epmd/src/epmd_int.h ++++ otp_src_R16B03/erts/epmd/src/epmd_int.h @@ -321,6 +321,9 @@ typedef struct { int listenfd[MAX_LISTEN_SOCKETS]; char *addresses; @@ -78,6 +78,3 @@ } EpmdVars; void dbg_printf(EpmdVars*,int,const char*,...); --- -1.8.1.4 - ++++++ 0002-Add-systemd-support-to-epmd.patch ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -9,11 +9,11 @@ erts/epmd/src/epmd_srv.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) -diff --git a/erts/configure.in b/erts/configure.in -index 6ba4c91..3ed1238 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -967,6 +967,8 @@ AC_CHECK_LIB(dl, dlopen) +Index: otp_src_R16B03/erts/configure.in +=================================================================== +--- otp_src_R16B03.orig/erts/configure.in ++++ otp_src_R16B03/erts/configure.in +@@ -969,6 +969,8 @@ AC_CHECK_LIB(dl, dlopen) AC_CHECK_LIB(inet, main) AC_CHECK_LIB(util, openpty) @@ -22,10 +22,10 @@ dnl Try to find a thread library. dnl dnl ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS, ETHR_THR_LIB_BASE and ETHR_DEFS -diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h -index bf1ddd8..363923e 100644 ---- a/erts/epmd/src/epmd_int.h -+++ b/erts/epmd/src/epmd_int.h +Index: otp_src_R16B03/erts/epmd/src/epmd_int.h +=================================================================== +--- otp_src_R16B03.orig/erts/epmd/src/epmd_int.h ++++ otp_src_R16B03/erts/epmd/src/epmd_int.h @@ -110,6 +110,10 @@ #include <stdarg.h> @@ -37,10 +37,10 @@ /* ************************************************************************ */ /* Replace some functions by others by making the function name a macro */ -diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c -index 90df7cc..cb8ca96 100644 ---- a/erts/epmd/src/epmd_srv.c -+++ b/erts/epmd/src/epmd_srv.c +Index: otp_src_R16B03/erts/epmd/src/epmd_srv.c +=================================================================== +--- otp_src_R16B03.orig/erts/epmd/src/epmd_srv.c ++++ otp_src_R16B03/erts/epmd/src/epmd_srv.c @@ -208,6 +208,39 @@ void run(EpmdVars *g) node_init(g); g->conn = conn_init(g); @@ -115,6 +115,3 @@ dbg_tty_printf(g,2,"entering the main select() loop"); --- -1.8.1.4 - ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -8,3 +8,18 @@ ### Upgrading from sysvinit ```/etc/sysconfig/erlang``` has no effect now, to configure EPMd use systemd capabilities instead. +### Example 1: change port +Create ```/etc/systemd/system/epmd.socket.d/port.conf``` with following content: +``` +[Socket] +ListenStream= +ListenStream=127.0.0.1:4444 +``` +The first line is to discard vendor configuration. The second line will change the port number to listen on to 4444. + +### Example 2: enable external interface +To enable accepting external connections to EPMd, create ```/etc/systemd/system/epmd.socket.d/port.conf``` with following content: +``` +[Socket] +ListenStream=0.0.0.0:4369 +``` ++++++ crypto.patch ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -5,10 +5,10 @@ In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not HAVE_EC. -diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c -index 42fb172..421d643 100644 ---- a/lib/crypto/c_src/crypto.c -+++ b/lib/crypto/c_src/crypto.c +Index: otp_src_R16B03/lib/crypto/c_src/crypto.c +=================================================================== +--- otp_src_R16B03.orig/lib/crypto/c_src/crypto.c ++++ otp_src_R16B03/lib/crypto/c_src/crypto.c @@ -77,7 +77,8 @@ #if OPENSSL_VERSION_NUMBER >= 0x009080ffL \ && !defined(OPENSSL_NO_EC) \ ++++++ erlang-not-install-misc.patch ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -9,10 +9,10 @@ erts/etc/unix/Install.src | 10 ---------- 2 files changed, 14 deletions(-) -Index: otp_src_R16B02/erts/etc/common/Makefile.in +Index: otp_src_R16B03/erts/etc/common/Makefile.in =================================================================== ---- otp_src_R16B02.orig/erts/etc/common/Makefile.in -+++ otp_src_R16B02/erts/etc/common/Makefile.in +--- otp_src_R16B03.orig/erts/etc/common/Makefile.in ++++ otp_src_R16B03/erts/etc/common/Makefile.in @@ -474,10 +474,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" @@ -24,10 +24,10 @@ ifneq ($(INSTALL_ERL_OSE),) $(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose" cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE) -Index: otp_src_R16B02/erts/etc/unix/Install.src +Index: otp_src_R16B03/erts/etc/unix/Install.src =================================================================== ---- otp_src_R16B02.orig/erts/etc/unix/Install.src -+++ otp_src_R16B02/erts/etc/unix/Install.src +--- otp_src_R16B03.orig/erts/etc/unix/Install.src ++++ otp_src_R16B03/erts/etc/unix/Install.src @@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_* cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot . cp -p $Name.boot start.boot ++++++ otp-R16B-rpath.patch ++++++ --- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200 @@ -1,7 +1,7 @@ -Index: otp_src_R16B02/lib/crypto/c_src/Makefile.in +Index: otp_src_R16B03/lib/crypto/c_src/Makefile.in =================================================================== ---- otp_src_R16B02.orig/lib/crypto/c_src/Makefile.in -+++ otp_src_R16B02/lib/crypto/c_src/Makefile.in +--- otp_src_R16B03.orig/lib/crypto/c_src/Makefile.in ++++ otp_src_R16B03/lib/crypto/c_src/Makefile.in @@ -85,7 +85,7 @@ endif DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ @@ -11,10 +11,10 @@ CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else -Index: otp_src_R16B02/lib/crypto/priv/Makefile +Index: otp_src_R16B03/lib/crypto/priv/Makefile =================================================================== ---- otp_src_R16B02.orig/lib/crypto/priv/Makefile -+++ otp_src_R16B02/lib/crypto/priv/Makefile +--- otp_src_R16B03.orig/lib/crypto/priv/Makefile ++++ otp_src_R16B03/lib/crypto/priv/Makefile @@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o # ---------------------------------------------------- @@ -24,10 +24,10 @@ -o $@ $^ -lcrypto $(DLL_NIFLIB): $(OBJS) -Index: otp_src_R16B02/lib/odbc/c_src/odbcserver.c +Index: otp_src_R16B03/lib/odbc/c_src/odbcserver.c =================================================================== ---- otp_src_R16B02.orig/lib/odbc/c_src/odbcserver.c -+++ otp_src_R16B02/lib/odbc/c_src/odbcserver.c +--- otp_src_R16B03.orig/lib/odbc/c_src/odbcserver.c ++++ otp_src_R16B03/lib/odbc/c_src/odbcserver.c @@ -105,6 +105,8 @@ #ifdef UNIX #include <unistd.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit calibre for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2014-03-31 20:42:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calibre" Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2014-02-18 14:43:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2014-03-31 20:42:40.000000000 +0200 @@ -1,0 +2,152 @@ +Sun Mar 23 12:03:01 UTC 2014 - saigkill(a)opensuse.org + +- Added download_tarball.sh for downloading the original tarball from + download.calibre-ebook.com, updating versionnumber in the specfile + and trigger osc vc +- New Features + o Edit Book: Add support for saved searches. Click Search->Saved + Searches to bring up a dialog where you can create and manage saved + searches + o Edit Book: New tool to specify semantics in EPUB books (semantics are + items in the guide such as preface, title-page, dedication, etc.). To + use it, go to Tools->Set Semantics + o Edit Book: Preview panel: Add a copy selected text action to the + context menu + o Edit Book: When inserting hyperlinks, allow specifying the text for + the hyperlink in the insert hyperlink dialog +- Bug fixes + o Fix a regression in the previous release that broke downloading + metadata for authors with a double initial such as R. A. Salvatore. + o Edit book: When generating inline Table of Contents, mark it as such + in the guide section of the OPF. + o E-book viewer: Fix right margin for last page in a chapter sometimes + disappearing when changing font size. + o Edit Book: Fix saving of empty files not working + o Edit book: Fix a regression in the previous release that broke saving + a copy of the current book on linux and OS X + o Edit book: Fix syntax highlighting in HTML files breaks if the closing + of a comment or processing instruction is at the start of a new line. + o Edit book: Fix check book failing in the presence of empty + o Catalogs: Fix handling of tristate boolean custom columns when + creating EPUB/MOBI catalogs. + o Linux build: Workaround for systems that have broken libc + implementations that change the behavior of truncate() on file + descriptors with O_APPEND set. + +------------------------------------------------------------------- +Sun Mar 16 19:58:08 UTC 2014 - andreas.stieger(a)gmx.de + +- change to unchanged upstream tarball for calibre and cssselect +- add source URLs +- remove generate-tarball.sh, the script did nothing but recreate + the tarball since r145 +- remove spec comments to that effect that are no longer in line + with what the script is actually doing +- remove conditionals around Sources + +------------------------------------------------------------------- +Sat Mar 8 20:00:31 UTC 2014 - saigkill(a)opensuse.org + +- update to 1.27.0 +- New Features: + * An option to add multiple books from inside a ZIP or RAR file. Right + click the Add Books button and choose 'Add multiple books from + archive'. + * Database backend: Make the database backend more robust when the + calibre library is placed on flaky filesystems. Now when an I/O error + occurs while writing to the database, the connection to the database + is closed and re-opened and the operation is retried. + * DJVU Input: Speedup extraction of text from DJVU files by implementing + the BZZ decoder algorithm in C +- New Bugfixes: + * MOBI Input: Fix empty tags not being handled correctly in rare cases + when the markup is bad enough to be parsed only using the fallback + HTML parser. + * Edit book: Fix column number of cursor shown in the bottom right being + one less than it should be. + * Edit book: Fix names for non-BMP unicode character (Such as emoticons) + not being displayed in the lower right corner. Also allow these + characters to be searched for by name in the Insert special character + tool. + * Do not show system tray notification popups while analyzing books on + device, as they can be slow on systems that display multiple messages + serially instead of replacing the last message + * Linux installer script: Do not use the filesystem to pass the + downloaded tarball to tar as it is possible for malicious code running + on the users computer to alter the download file between signature + verification and calling tar to extract the files. + * DJVU Input: When extracting embedded txt from TXTz sections in DJVU + files, fix incorrect extraction of txt when the djvutxt external + program is not present. + * Edit Book: Fix import HTML file as new book not working on OS X + * Wireless device driver: Fix a regression that prevented it form + working with the Calibre Sync Android app. + * Fix a regression in 1.26 that caused width and height attributes on + tags to generate CSS width and height properties without a 'px' suffix + * Linux binary installer: Fix an error when using proxies and python 3 + with the new installer script + * Edit book: When exporting files, fill the choose filename popup with + the name of the file being exported as the default name + * Make the new Linux installer script compatible with python 2.6. + +------------------------------------------------------------------- +Sun Mar 2 11:05:28 UTC 2014 - saigkill(a)opensuse.org + +- update to 1.26.0 +- New Features: + * Edit Book: Allow direct importing of HTML or DOCX files as new books + without doing a full conversion. Use File->Import HTML or DOCX to + import a file as a new EPUB book with minimal changes from the + original. + * Linux binary installer: Various improvements to the binary installer. + It now creates an un-installer (calibre-uninstall) that will remove + all files created by the installer. It also no longer asks for the + installation directory. If you wish to change that, you need to + specify it in the installation command itself. Also the installer is + now downloaded securely via HTTPS from github and verifies the + signature of the installed files. Finally, it can be used to create an + isolated install, that only makes changes to files in the installation + directory and does not require root privileges. + * Metadata download: Add an option to merge the downloaded comments into + existing comments, instead of overwriting (Preferences->Metadata + download). + * Edit book: Add an option to automatically beautify individual files + whenever they are opened for editing. Look under 'Editor Settings' in + the Edit Book Preferences. + * Bulk metadata download: When reviewing downloaded metadata allow + hiding the controls on the comments box by right clicking in the + comments area. Useful on smaller screens. + * E-book viewer: When displaying metadata for the book, also display + custom column metadata +- Bug Fixes: + * Smarten punctuation: Correct handling for decade abbreviations like + '60s and measurements in feet and inches like 1' 2". + * EPUB Output: If the output profile is set to one of the Nook profiles, + do not use shorthand CSS properties as the Nook cannot handle them. + * Conversion: Fix incorrect CSS being generated when converting files + that have tags with width or height attributes that contain + fractional numbers. + * Edit Book: When editing EPUB files, and a file is added in META-INF/ + do not automatically add it to the manifest. Also do not warn about + unmanifested files inside META-INF/ since a few vendors (Apple) + require non standard files in that location. + * Fix Book details popup window not being updated when editing metadata + in the main window + * Edit book: Fix editor not marking the book as modified when doing a + Replace All that does not affect any currently open files. + * Windows: Use a separate worker process to move files to the recycle + bin. Fixes the problem of the recycle bin icon not being updated when + deleting books into an empty recycle bin. Also avoids the overhead of + launching a new, short-lived worker process for every delete. + * calibredb: When deleting books/formats wait for deleted files to be + moved to recycle bin, before quitting + * RTF Output: Fix invalid RTF being produced when the text contains a + double backslash. + * Edit book: Fix option to disable showing the character before cursor + not working + * Get Books: Update various store plugins to account for changes to the + store websites + * Fix virtual library names with ampersands in them not being displayed + correctly in the virtual library menu and tab bar + +------------------------------------------------------------------- Old: ---- calibre-1.23.0.tar.bz2 calibre-cssselect-0.7.1.tar.gz generate-tarball.sh New: ---- calibre-1.29.0.tar.xz cssselect-0.7.1.tar.gz download_tarball.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.FF4z1z/_old 2014-03-31 20:42:41.000000000 +0200 +++ /var/tmp/diff_new_pack.FF4z1z/_new 2014-03-31 20:42:41.000000000 +0200 @@ -16,33 +16,22 @@ # +%define intree_cssselect_version 0.7.1 + Summary: EBook Management Application License: GPL-3.0 Group: Productivity/Other Name: calibre -Version: 1.23.0 +Version: 1.29.0 Release: 0 Url: http://calibre-ebook.com - -# Getting and modifying the sources -#---------------------------------- -# Do not use unmodified upstream sources, since they contain proprietary -# fonts which we are not allowed to distribute. Furthermore, the Liberation -# fonts, which are available as a separate package, are also included. Call -# sh generate-tarball.sh <VERSION> -# which downloads the sources, deletes the fonts and repacks it to -# calibre-$VERSION-nofonts.tar.bz2 -Source0: %{name}-%{version}.tar.bz2 -#Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz +Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz Source2: %{name}.desktop Source3: %{name}.png -Source4: generate-tarball.sh -%if 0%{?suse_version} == 1220 -Source5: %{name}-cssselect-0.7.1.tar.gz -%endif -Patch1: %{name}-0.9.38-pillow.patch -Patch2: %{name}-setup.install.py.diff -Patch3: %{name}-no-update.diff +Source5: https://pypi.python.org/packages/source/c/cssselect/cssselect-%{intree_csss… +Patch1: calibre-0.9.38-pillow.patch +Patch2: calibre-setup.install.py.diff +Patch3: calibre-no-update.diff #If a package is obsoleted by a compatible replacement, the obsoleted package #should also be provided in order to not cause unnecessary dependency breakage. @@ -166,7 +155,7 @@ # Add cssselect private code, only for opensuse 12.2 %if 0%{?suse_version} == 1220 -tar xzf %{SOURCE5} -C $RPM_BUILD_DIR/%{name}/src/ --strip-components=1 cssselect-0.7.1/cssselect/ +tar xzf %{SOURCE5} -C $RPM_BUILD_DIR/%{name}/src/ --strip-components=1 cssselect-%{intree_cssselect_version}/cssselect/ %endif %build ++++++ calibre-cssselect-0.7.1.tar.gz -> cssselect-0.7.1.tar.gz ++++++ ++++ no output (probably identical) ++++++ download_tarball.sh ++++++ #!/bin/sh # # Copyright (c) 2010,2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # Authors: Sascha Manns <saigkill(a)opensuse.org> # Frank Sundermeyer <fsundermeyer(a)opensuse.org> # # Downloads the latest source file for Calibre from # http://download.calibre-ebook.com #---------- # Functions #---------- VERSION=$1 URL="http://download.calibre-ebook.com/$VERSION/calibre-$VERSION.tar.xz" # usage function usage { echo -e "\nusage: $0 VERSION\n" echo -e "Downloads the specified version of source file for Calibre from" echo -e "http://download.calibre-ebook.com" exit 1 } #----- # Main #----- # echo -n "Downloading .... " wget $URL echo "done" # echo -n "Adding calibre-$VERSION.tar.xz to OBS ... " # Add Tarball osc add $(pwd)/calibre-$VERSION.tar.xz echo "done" # Change Spec echo "Change Version in Spec" sed "/^Version/ c\Version: $VERSION" calibre.spec > calibre.spec.tmp mv calibre.spec.tmp calibre.spec echo "Done" # Add changelog osc vc exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aqbanking for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package aqbanking for openSUSE:Factory checked in at 2014-03-31 20:42:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqbanking (Old) and /work/SRC/openSUSE:Factory/.aqbanking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aqbanking" Changes: -------- --- /work/SRC/openSUSE:Factory/aqbanking/aqbanking.changes 2014-03-04 13:20:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aqbanking.new/aqbanking.changes 2014-03-31 20:42:27.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 31 09:23:53 UTC 2014 - jcnengel(a)gmail.com + +- Update to 5.4.2beta + + Introduce command sepadebitnotes for aqbanking-cli + +------------------------------------------------------------------- Old: ---- aqbanking-5.4.1beta.tar.gz New: ---- aqbanking-5.4.2beta.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqbanking.spec ++++++ --- /var/tmp/diff_new_pack.Khz8RJ/_old 2014-03-31 20:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Khz8RJ/_new 2014-03-31 20:42:28.000000000 +0200 @@ -26,7 +26,7 @@ %define q4b_cfgmoddir %{fronts_libdir}/q4banking/cfgmodules Name: aqbanking -Version: 5.4.1beta +Version: 5.4.2beta Release: 0 Summary: Library for Online Banking Functions and Financial Data Import and Export License: GPL-2.0 or GPL-3.0 ++++++ aqbanking-5.4.1beta.tar.gz -> aqbanking-5.4.2beta.tar.gz ++++++ ++++ 1793 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/ChangeLog new/aqbanking-5.4.2beta/ChangeLog --- old/aqbanking-5.4.1beta/ChangeLog 2014-03-02 15:48:30.000000000 +0100 +++ new/aqbanking-5.4.2beta/ChangeLog 2014-03-30 21:54:42.000000000 +0200 @@ -1,6 +1,39 @@ ------------------------------------------------------------------ -2014-03-02 15:48:17 +0100 Martin Preuss +2014-03-30 00:10:53 +0000 martin +CSV: Added a profile for SEPA debit notes. +This profile can be used to import SEPA debit notes to be send to a bank. + +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2547 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ +2014-03-25 21:58:38 +0000 martin +CSV-ImExporter: Added SEPA debit note fields to "full" profile. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2546 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ +2014-03-25 21:51:24 +0000 martin +AqBanking-CLI: Added command "sepadebitnotes" +This command reads multiple debit notes from a file. + +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2545 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ +2014-03-25 21:49:57 +0000 martin +AqBanking-CLI: Fixed a typo. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2544 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ +2014-03-24 21:45:23 +0000 martin +AqHBCI: Started supporting COR1 SEPA debit notes. +Those new jobs aren't used ATM, we still have to figure out a way to select +this type of jobs. + +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2543 5c42a225-8b10-0410-9873-89b7810ad06e + +------------------------------------------------------------------ +2014-03-02 14:49:50 +0000 martin Prepared release 5.4.1beta. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2542 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ 2014-03-01 20:23:13 +0000 martin @@ -626,35 +659,3 @@ 2014-01-08 22:26:37 +0000 martin AqHBCI: Fixed limits for remote name in SEPA jobs. git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2448 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-08 22:25:28 +0000 martin -HHD: Addd function AH_HHD14_AddChallengeParams_32(). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2447 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-08 22:24:18 +0000 martin -Make AB_TRANSACTION_LIST public. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2446 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-08 19:53:02 +0000 mlenk -Fix check for Gwenhywfar version -Gwenhywfar 4.9.0 is required for GWEN_HTTP_SESSION_FLAGS_TLS_ONLY_SAFE_CIPHERS - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2445 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-07 20:44:55 +0000 martin -AqHBCI: Fallback to old SingleDebit job if SepaDebitDatedSingleCreate is not supported. -This is just a hack because the old job is no longer maintained by the -SEPA extension to FinTS. - -Next task will be to provide a job SepaDebitDatedMultiCreate. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2444 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-07 20:43:47 +0000 martin -aqbanking-cli: Use AB_Banking_FillGapsInTransaction(). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2443 5c42a225-8b10-0410-9873-89b7810ad06e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/aqbanking.iss new/aqbanking-5.4.2beta/aqbanking.iss --- old/aqbanking-5.4.1beta/aqbanking.iss 2014-03-02 15:47:28.000000000 +0100 +++ new/aqbanking-5.4.2beta/aqbanking.iss 2014-03-30 21:53:30.000000000 +0200 @@ -8,7 +8,7 @@ [Setup] ; Using the name here directly because we want it capitalized AppName=AqBanking -AppVerName=AqBanking 5.4.1beta +AppVerName=AqBanking 5.4.2beta AppPublisher=AqBanking Development Team AppPublisherURL=http://sourceforge.net/projects/aqbanking AppSupportURL=http://sourceforge.net/support/getsupport.php?group_id=115695 @@ -18,7 +18,7 @@ DirExistsWarning=no InfoAfterFile=README LicenseFile=COPYING -OutputBaseFilename=aqbanking-5.4.1beta-setup +OutputBaseFilename=aqbanking-5.4.2beta-setup OutputDir=. UninstallFilesDir={app}\uninstall\aqbanking @@ -151,7 +151,7 @@ StringChange(FileString, '@'+'aqbanking_pkgdatadir@', pkgdatadir); StringChange(FileString, '@'+'AQBANKING_VERSION_MAJOR@', '5'); StringChange(FileString, '@'+'AQBANKING_VERSION_MINOR@', '4'); - StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '1'); + StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '2'); StringChange(FileString, '@'+'AQBANKING_VERSION_BUILD@', '0'); StringChange(FileString, '@'+'AQBANKING_VERSION_TAG@', 'beta'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/aqbanking.spec new/aqbanking-5.4.2beta/aqbanking.spec --- old/aqbanking-5.4.1beta/aqbanking.spec 2014-03-02 15:47:28.000000000 +0100 +++ new/aqbanking-5.4.2beta/aqbanking.spec 2014-03-30 21:53:30.000000000 +0200 @@ -2,7 +2,7 @@ # neededforbuild gwenhywfar gwenhywfar-devel ktoblzcheck python python-ctypes pyyxml libchipcard2-devel libchipcard2 pkgconfig gettext-devel libacl-devel libacl libattr-devel libattr %define name aqbanking -%define version 5.4.1beta +%define version 5.4.2beta %define dist %define disttag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/configure.ac new/aqbanking-5.4.2beta/configure.ac --- old/aqbanking-5.4.1beta/configure.ac 2014-03-02 15:47:03.000000000 +0100 +++ new/aqbanking-5.4.2beta/configure.ac 2014-03-30 21:53:11.000000000 +0200 @@ -25,7 +25,7 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=4 -AQBANKING_VERSION_PATCHLEVEL=1 +AQBANKING_VERSION_PATCHLEVEL=2 AQBANKING_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "svn" AQBANKING_VERSION_TAG="beta" @@ -43,7 +43,7 @@ AQBANKING_SO_CURRENT=38 AQBANKING_SO_AGE=4 -AQBANKING_SO_REVISION=1 +AQBANKING_SO_REVISION=2 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # @@ -1431,6 +1431,7 @@ src/plugins/imexporters/csv/profiles/cli-transfers.conf src/plugins/imexporters/csv/profiles/sns.conf src/plugins/imexporters/csv/profiles/transfers.conf + src/plugins/imexporters/csv/profiles/sepadebitnotes.conf src/plugins/imexporters/openhbci1/Makefile src/plugins/imexporters/openhbci1/openhbci1.xml src/plugins/imexporters/openhbci1/profiles/Makefile @@ -1454,8 +1455,11 @@ src/plugins/imexporters/sepa/profiles/ccm.conf src/plugins/imexporters/sepa/profiles/001_002_03.conf src/plugins/imexporters/sepa/profiles/008_001_01.conf + src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf src/plugins/imexporters/sepa/profiles/008_002_02.conf + src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf src/plugins/imexporters/sepa/profiles/008_003_02.conf + src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf src/plugins/imexporters/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/profiles/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/i18nsources new/aqbanking-5.4.2beta/i18nsources --- old/aqbanking-5.4.1beta/i18nsources 2014-03-02 15:47:32.000000000 +0100 +++ new/aqbanking-5.4.2beta/i18nsources 2014-03-30 21:53:31.000000000 +0200 @@ -170,6 +170,7 @@ src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.c src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.c src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.c +src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.c src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am 2014-01-17 22:54:38.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am 2014-03-24 21:45:34.000000000 +0100 @@ -39,6 +39,8 @@ jobsepaxfersingle_p.h \ jobsepadebitsingle_l.h \ jobsepadebitsingle_p.h \ + jobsepacor1datedsinglecreate_l.h \ + jobsepacor1datedsinglecreate_p.h \ jobtransferbase_l.h jobtransferbase_p.h \ jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h @@ -57,6 +59,7 @@ jobsepadebitdatedmulticreate.c \ jobsepaxfersingle.c \ jobsepadebitsingle.c \ + jobsepacor1datedsinglecreate.c \ jobtransferbase.c \ jobsepastandingordercreate.c @@ -92,6 +95,7 @@ $(srcdir)/jobsepadebitdatedmulticreate.xml \ $(srcdir)/jobsepaxfersingle.xml \ $(srcdir)/jobsepadebitsingle.xml \ + $(srcdir)/jobsepacor1datedsinglecreate.xml \ $(srcdir)/jobsepastandingordercreate.xml \ $(srcdir)/jobsepastandingorderget.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c 2014-03-24 22:42:22.000000000 +0100 @@ -0,0 +1,257 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin(a)libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + + +#include "jobsepacor1datedsinglecreate_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include <gwenhywfar/debug.h> +#include <gwenhywfar/misc.h> +#include <gwenhywfar/inherit.h> +#include <gwenhywfar/text.h> + +#include <aqbanking/jobsepadebitnote_be.h> +#include <aqbanking/job_be.h> + +#include <stdlib.h> +#include <assert.h> +#include <string.h> + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaCor1DebitDatedSingleCreate_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + GWEN_DB_NODE *dbArgs; + + j=AH_Job_TransferBase_new("JobSepaCor1DebitDatedSingleCreate", + AB_Transaction_TypeSepaDebitNote, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 29); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + AH_Job_TransferBase_LoadSepaDescriptors(j); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AB_TRANSACTION_LIMITS *lim; + GWEN_DB_NODE *dbParams; + int i, i1, i2; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + AB_TransactionLimits_SetNeedDate(lim, 1); + + /* set info from BPD */ + i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1>i2)?i1:i2; + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1<i2)?i1:i2; + AB_TransactionLimits_SetMaxValueSetupTime(lim, i); + + AB_Job_SetFieldLimits(bj, lim); + AB_TransactionLimits_free(lim); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + const AB_TRANSACTION *t; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); + return GWEN_ERROR_INVALID; + } + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + if (tanVer==AH_JOB_TANVER_1_4) { + int rv; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + rv=AH_HHD14_AddChallengeParams_29(j, + AB_Transaction_GetValue(t), + AB_Transaction_GetRemoteIban(t), + AB_Transaction_GetDate(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaCor1DebitDatedSingleCreate_Prepare(AH_JOB *j) { + GWEN_DB_NODE *dbArgs; + AB_BANKING *ab; + AB_USER *u; + int rv; + const char *profileName=""; + const char *descriptor=""; + const char *s; + AB_TRANSACTION *t; + GWEN_BUFFER *dbuf; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); + + ab=AH_Job_GetBankingApi(j); + assert(ab); + + u=AH_Job_GetUser(j); + assert(u); + + dbArgs=AH_Job_GetArguments(j); + + /* choose from HISPAS */ + /* first check for any descriptor for pain 008.003.02 */ + s=AH_Job_TransferBase_FindSepaDescriptor(j, "*008.003.02*"); + if (s) { + profileName="008_003_02_cor1"; + descriptor=s; + } + if (!(descriptor && *descriptor)) { + /* look for pain 008.002.02 */ + s=AH_Job_TransferBase_FindSepaDescriptor(j, "*008.002.02*"); + if (s) { + profileName="008_002_02_cor1"; + descriptor=s; + } + } + if (!(descriptor && *descriptor)) { + /* look for pain 008.001.01 */ + s=AH_Job_TransferBase_FindSepaDescriptor(j, "*008.001.01*"); + if (s) { + profileName="008_001_01_cor1"; + descriptor=s; + } + } + + /* check for valid descriptor */ + if (!(descriptor && *descriptor)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found, please update your SEPA account information"); + return GWEN_ERROR_GENERIC; + } + DBG_INFO(AQHBCI_LOGDOMAIN, "Using SEPA descriptor %s", descriptor); + + + /* add transactions to ImExporter context */ + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + assert(t); /* debug */ + return GWEN_ERROR_INTERNAL; + } + + /* export transfers to SEPA */ + dbuf=GWEN_Buffer_new(0, 256, 0, 1); + rv=AH_Job_TransferBase_SepaExportTransactions(j, profileName, dbuf); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + GWEN_Buffer_free(dbuf); + return rv; + } + + /* store descriptor */ + GWEN_DB_SetCharValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "descriptor", + descriptor); + /* store transfer */ + GWEN_DB_SetBinValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "transfer", + GWEN_Buffer_GetStart(dbuf), + GWEN_Buffer_GetUsedBytes(dbuf)); + GWEN_Buffer_free(dbuf); + + return 0; +} + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml 2014-03-24 21:48:52.000000000 +0100 @@ -0,0 +1,104 @@ + +<SEGs> + + +  + + +  + <SEGdef id="SepaCor1DebitDatedSingleCreate" + code="HKDSC" + version="1" + delimiter="+" + terminator="'" + > + <GROUP type="SegHead" name="head" /> + <GROUP type="kti_i" version="1" /> + <ELEM name="descriptor" type="ascii" maxsize="256" /> + <ELEM name="transfer" type="bin" trustlevel="4" /> + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + </SEGdef> + + +  + <SEGdef id="SepaCor1DebitDatedSingleCreateResponse" code="HIDSC" version="1" + delimiter="+" terminator="'" > + <GROUP type="SegHead" name="head" /> + <ELEM name="referenceId" type="AN" maxsize="99" minnum="0" /> + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + </SEGdef> + + +  + <SEGdef code="HIDSCS" version="1" + delimiter=":" terminator="'" isbpdjob="1" > + <GROUP type="BPDJob" version="2" /> + + <ELEM name="minDelay_FNAL_RCUR" type="num" maxsize="4" /> + <ELEM name="maxdelay_FNAL_RCUR" type="num" maxsize="4" /> + <ELEM name="minDelay_FRST_OOFF" type="num" maxsize="4" /> + <ELEM name="maxdelay_FRST_OOFF" type="num" maxsize="4" /> + <GROUP name="SupportedPurposeCodes" delimiter=":" terminator="" > + <ELEM name="Code" type="ascii" maxsize="4096" minnum="0" maxnum="99" /> + </GROUP> + <GROUP name="SupportedSepaFormats" delimiter=":" terminator="" > + <ELEM name="Format" type="ascii" maxsize="256" minnum="0" maxnum="9" /> + </GROUP> + + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + </SEGdef> + + + +</SEGs> + + + +<JOBs> + +  + <JOBdef id="JobSepaCor1DebitDatedSingleCreate" + code="HKDSE" + params="HIDSCS" + version="1" + crypt="1" + sign="1" + needBPD="1" + response="SepaCor1DebitDatedSingleCreateResponse" + > + <SEG type="SepaCor1DebitDatedSingleCreate" version="1" /> + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + </JOBdef> + + + +</JOBs> + + + + + + + + + + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_l.h new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_l.h --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_l.h 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_l.h 2014-03-24 21:26:32.000000000 +0100 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin(a)libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_L_H +#define AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaCor1DebitDatedSingleCreate_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_L_H */ + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_p.h new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_p.h --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate_p.h 2014-03-24 22:36:59.000000000 +0100 @@ -0,0 +1,31 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin(a)libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_P_H +#define AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_P_H + + +#include "jobsepacor1datedsinglecreate_l.h" +#include <gwenhywfar/db.h> + + + +static int AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); +static int AH_Job_SepaCor1DebitDatedSingleCreate_Prepare(AH_JOB *j); + + + +#endif /* AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_P_H */ + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c 2014-02-03 21:40:32.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c 2014-03-24 22:42:09.000000000 +0100 @@ -71,6 +71,7 @@ aj=(AH_JOB_TRANSFERBASE*)p; free(aj->fiid); + GWEN_StringList_free(aj->sepaDescriptors); GWEN_FREE_OBJECT(aj); } @@ -587,6 +588,77 @@ +/* --------------------------------------------------------------- FUNCTION */ +void AH_Job_TransferBase_LoadSepaDescriptors(AH_JOB *j){ + AH_JOB_TRANSFERBASE *aj; + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbT; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + /* get params */ + dbParams=AH_Job_GetParams(j); + assert(dbParams); + + if (aj->sepaDescriptors==NULL) + aj->sepaDescriptors=GWEN_StringList_new(); + else + GWEN_StringList_Clear(aj->sepaDescriptors); + + /* read supported SEPA formats */ + dbT=GWEN_DB_FindFirstGroup(dbParams, "SupportedSepaFormats"); + if (!dbT) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found"); + GWEN_DB_Dump(dbParams, 2); + } + while(dbT) { + int i; + + for (i=0; i<100; i++) { + const char *s; + + s=GWEN_DB_GetCharValue(dbT, "format", i, NULL); + if (! (s && *s)) + break; + GWEN_StringList_AppendString(aj->sepaDescriptors, s, 0, 1); + DBG_INFO(AQHBCI_LOGDOMAIN, + "Adding SEPA descriptor [%s] for GV %s", + s, AH_Job_GetName(j)); + } + + dbT=GWEN_DB_FindNextGroup(dbT, "SupportedSepaFormats"); + } +} + + + +/* --------------------------------------------------------------- FUNCTION */ +const char *AH_Job_TransferBase_FindSepaDescriptor(AH_JOB *j, const char *tmpl) { + AH_JOB_TRANSFERBASE *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + if (aj->sepaDescriptors) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(aj->sepaDescriptors); + while(se) { + const char *s; + + s=GWEN_StringListEntry_Data(se); + if (s && *s && -1!=GWEN_Text_ComparePattern(s, tmpl, 1)) + return s; + + se=GWEN_StringListEntry_Next(se); + } + } + + return NULL; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h 2014-01-18 14:20:35.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h 2014-03-24 22:40:50.000000000 +0100 @@ -41,6 +41,27 @@ int AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); +/** + * @name SEPA Descriptors + * For jobs which have their own list of supported SEPA formats in their BPD those can be handled here. + * Those jobs MUST call @ref AH_Job_TransferBase_LoadSepaDescriptors inside the constructor. + */ +/*@{*/ + +/** + * Load list of supported SEPA descriptors from the job's BPD. + */ +void AH_Job_TransferBase_LoadSepaDescriptors(AH_JOB *j); + +/** + * Find a SEPA descriptor in the internal list of supported SEPA descriptors read from the BPD. + */ +const char *AH_Job_TransferBase_FindSepaDescriptor(AH_JOB *j, const char *tmpl); + +/*@}*/ + + + #endif /* AH_JOBTRANSFERBASE_L_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h --- old/aqbanking-5.4.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h 2014-01-14 21:43:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h 2014-03-24 22:29:30.000000000 +0100 @@ -25,6 +25,8 @@ AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeArgsFn; AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeResultsFn; + GWEN_STRINGLIST *sepaDescriptors; + }; static void GWENHYWFAR_CB AH_Job_TransferBase_FreeData(void *bp, void *p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/backends/aqofxconnect/version.h new/aqbanking-5.4.2beta/src/plugins/backends/aqofxconnect/version.h --- old/aqbanking-5.4.1beta/src/plugins/backends/aqofxconnect/version.h 2014-03-02 15:47:28.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/backends/aqofxconnect/version.h 2014-03-30 21:53:30.000000000 +0200 @@ -16,11 +16,11 @@ #define AQOFXCONNECT_VERSION_MAJOR 5 #define AQOFXCONNECT_VERSION_MINOR 4 -#define AQOFXCONNECT_VERSION_PATCHLEVEL 1 +#define AQOFXCONNECT_VERSION_PATCHLEVEL 2 #define AQOFXCONNECT_VERSION_BUILD 0 #define AQOFXCONNECT_VERSION_TAG "beta" -#define AQOFXCONNECT_VERSION_FULL_STRING "5.4.1.0beta" -#define AQOFXCONNECT_VERSION_STRING "5.4.1" +#define AQOFXCONNECT_VERSION_FULL_STRING "5.4.2.0beta" +#define AQOFXCONNECT_VERSION_STRING "5.4.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/csv/profiles/Makefile.am new/aqbanking-5.4.2beta/src/plugins/imexporters/csv/profiles/Makefile.am --- old/aqbanking-5.4.1beta/src/plugins/imexporters/csv/profiles/Makefile.am 2012-08-03 22:24:05.000000000 +0200 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/csv/profiles/Makefile.am 2014-03-29 19:43:27.000000000 +0100 @@ -7,7 +7,7 @@ diba.conf.in sparda.conf.in full.conf.in dkb.conf.in dkb-cash.conf.in \ hypovereinsbank.conf.in postbankffm.conf.in cli-transfers.conf.in \ sns.conf.in consors-tagesgeld.conf.in \ - transfers.conf.in + transfers.conf.in sepadebitnotes.conf.in profilesdir = $(aqbanking_pkgdatadir)/imexporters/csv/profiles profiles_DATA=default.conf aqmoney1.conf aqmoney2.conf \ @@ -17,5 +17,5 @@ diba.conf sparda.conf full.conf dkb.conf dkb-cash.conf \ hypovereinsbank.conf postbankffm.conf cli-transfers.conf \ sns.conf consors-tagesgeld.conf \ - transfers.conf + transfers.conf sepadebitnotes.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/csv/profiles/full.conf.in new/aqbanking-5.4.2beta/src/plugins/imexporters/csv/profiles/full.conf.in --- old/aqbanking-5.4.1beta/src/plugins/imexporters/csv/profiles/full.conf.in 2010-02-13 14:45:14.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/csv/profiles/full.conf.in 2014-03-25 22:56:54.000000000 +0100 @@ -131,8 +131,16 @@ 78="commission/value" 79="commission/currency" 80="bankAccountId" - 81="groupId" # double entry + 81="groupId" # double entry + 82="creditorSchemeId" # SEPA debit notes + 83="mandateId" + 84="mandateDate/dateString" + 85="mandateDebitorName" + 86="sequenceType" + 87="originalCreditorSchemeId" + 88="originalMandateId" + 89="originalCreditorName" } # columns } # params diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in new/aqbanking-5.4.2beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in --- old/aqbanking-5.4.1beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in 2014-03-29 19:55:46.000000000 +0100 @@ -0,0 +1,56 @@ + +char name="sepadebitnotes" +char shortDescr="sepadebitnotes" +char version="@AQBANKING_CLI_VERSION_STRING@" +char longDescr="This profile is used for SEPA debit notes" +int import="1" +int export="1" + +char type="csv" +char groupNames="transaction", "transfer", "debitnote", "line" +char dateFormat="YYYY/MM/DD" +int utc="0" + +char subject="transactions" + +params { + # if 1 then values are quoted + quote="1" + + # if 1 then a title line will be written containing the names of each + # column + title="1" + + # special values are "TAB" and "SPACE" + delimiter=";" + + # this is the group name looked for in the given data to GWEN_CSV_Write + # if not given then all groups match + #group="transaction" + + # this group contains the definition for each column + # each variable in this group has its number as name + # you can use index variables in the names (using square brackets) + columns { + 1="localBic" + 2="localIban" + 3="remoteBic" + 4="remoteIban" + 5="date" + 6="value/value" + 7="value/currency" + 8="localName" + 9="remoteName" + 19="creditorSchemeId" # SEPA debit notes + 11="mandateId" + 12="mandateDate/dateString" + 13="mandateDebitorName" + 14="sequenceType" + 15="purpose[0]" + 16="purpose[1]" + 17="purpose[2]" + 18="purpose[3]" + } # columns + +} # params + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in 2014-03-24 22:15:20.000000000 +0100 @@ -0,0 +1,11 @@ + +char name="008_001_01_cor1" +char shortDescr="pain.008.001.01_cor1" +char version="@AQBANKING_VERSION_STRING@" +char longDescr="COR1 profile for pain.008.001.01" +int import="0" +int export="1" + +char type="008_001_01_cor1" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in 2014-03-24 22:18:40.000000000 +0100 @@ -0,0 +1,11 @@ + +char name="008_002_02_cor1" +char shortDescr="pain.008.002.02_cor1" +char version="@AQBANKING_VERSION_STRING@" +char longDescr="COR1 profile for pain.008.002.02_cor1" +int import="0" +int export="1" + +char type="008_002_02_cor1" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in 2014-03-24 22:16:04.000000000 +0100 @@ -0,0 +1,11 @@ + +char name="008_003_02_cor1" +char shortDescr="pain.008.003.02_cor1" +char version="@AQBANKING_VERSION_STRING@" +char longDescr="COR1 profile for pain.008.003.02_cor1" +int import="0" +int export="1" + +char type="008_003_02_cor1" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/Makefile.am new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/Makefile.am --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/profiles/Makefile.am 2013-10-20 01:04:32.000000000 +0200 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/profiles/Makefile.am 2014-03-24 22:16:59.000000000 +0100 @@ -4,8 +4,11 @@ ccm.conf.in \ 001_002_03.conf.in \ 008_001_01.conf.in \ + 008_001_01_cor1.conf.in \ 008_002_02.conf.in \ - 008_003_02.conf.in + 008_002_02_cor1.conf.in \ + 008_003_02.conf.in \ + 008_003_02_cor1.conf.in profilesdir = $(aqbanking_pkgdatadir)/imexporters/sepa/profiles profiles_DATA=default.conf ccm.conf 001_002_03.conf 008_001_01.conf 008_002_02.conf 008_003_02.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa.c new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa.c --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa.c 2013-10-19 15:11:09.000000000 +0200 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa.c 2014-03-24 21:42:11.000000000 +0100 @@ -104,13 +104,22 @@ return AH_ImExporterSEPA_Export_001_002_03(ie, ctx, sio, params); } else if (strcasecmp(s, "008_001_01")==0) { - return AH_ImExporterSEPA_Export_008_001_01(ie, ctx, sio, params); + return AH_ImExporterSEPA_Export_008_001_01(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Default); + } + else if (strcasecmp(s, "008_001_01_cor1")==0) { + return AH_ImExporterSEPA_Export_008_001_01(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Cor1); } else if (strcasecmp(s, "008_002_02")==0) { - return AH_ImExporterSEPA_Export_008_002_02(ie, ctx, sio, params); + return AH_ImExporterSEPA_Export_008_002_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Default); + } + else if (strcasecmp(s, "008_002_02_cor1")==0) { + return AH_ImExporterSEPA_Export_008_002_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Cor1); } else if (strcasecmp(s, "008_003_02")==0) { - return AH_ImExporterSEPA_Export_008_003_02(ie, ctx, sio, params); + return AH_ImExporterSEPA_Export_008_003_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Default); + } + else if (strcasecmp(s, "008_003_02_cor1")==0) { + return AH_ImExporterSEPA_Export_008_003_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Cor1); } else { DBG_ERROR(AQBANKING_LOGDOMAIN, "Unknown SEPA type \"%s\"", s); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c 2014-03-01 20:23:15.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c 2014-03-24 21:39:52.000000000 +0100 @@ -7,7 +7,8 @@ int AH_ImExporterSEPA_Export_008_001_01(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, - GWEN_DB_NODE *params){ + GWEN_DB_NODE *params, + int subType){ GWEN_XMLNODE *root; GWEN_XMLNODE *documentNode; GWEN_XMLNODE *painNode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c 2014-03-01 20:23:15.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c 2014-03-24 21:44:15.000000000 +0100 @@ -7,7 +7,8 @@ int AH_ImExporterSEPA_Export_008_002_02(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, - GWEN_DB_NODE *params){ + GWEN_DB_NODE *params, + int subType){ GWEN_XMLNODE *root; GWEN_XMLNODE *documentNode; GWEN_XMLNODE *painNode; @@ -171,7 +172,11 @@ nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "LclInstrm"); if (nnn) { - GWEN_XMLNode_SetCharValue(nnn, "Cd", "CORE"); + switch(subType) { + default: + case AH_ImExportSEPA_SubType_Default: GWEN_XMLNode_SetCharValue(nnn, "Cd", "CORE"); break; + case AH_ImExportSEPA_SubType_Cor1: GWEN_XMLNode_SetCharValue(nnn, "Cd", "COR1"); break; + } GWEN_XMLNode_AddChild(nn, nnn); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c 2014-03-01 20:23:15.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c 2014-03-24 21:43:25.000000000 +0100 @@ -7,7 +7,8 @@ int AH_ImExporterSEPA_Export_008_003_02(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, - GWEN_DB_NODE *params){ + GWEN_DB_NODE *params, + int subType){ GWEN_XMLNODE *root; GWEN_XMLNODE *documentNode; GWEN_XMLNODE *painNode; @@ -172,7 +173,11 @@ nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "LclInstrm"); if (nnn) { - GWEN_XMLNode_SetCharValue(nnn, "Cd", "CORE"); + switch(subType) { + default: + case AH_ImExportSEPA_SubType_Default: GWEN_XMLNode_SetCharValue(nnn, "Cd", "CORE"); break; + case AH_ImExportSEPA_SubType_Cor1: GWEN_XMLNode_SetCharValue(nnn, "Cd", "COR1"); break; + } GWEN_XMLNode_AddChild(nn, nnn); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_p.h new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_p.h --- old/aqbanking-5.4.1beta/src/plugins/imexporters/sepa/sepa_p.h 2013-10-19 15:11:27.000000000 +0200 +++ new/aqbanking-5.4.2beta/src/plugins/imexporters/sepa/sepa_p.h 2014-03-24 21:44:13.000000000 +0100 @@ -21,6 +21,13 @@ }; + +enum { + AH_ImExportSEPA_SubType_Default=0, + AH_ImExportSEPA_SubType_Cor1 +}; + + AQBANKING_EXPORT GWEN_PLUGIN *imexporter_sepa_factory(GWEN_PLUGIN_MANAGER *pm, const char *name, @@ -67,20 +74,23 @@ int AH_ImExporterSEPA_Export_008_001_01(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, - GWEN_DB_NODE *params); + GWEN_DB_NODE *params, + int subType); static int AH_ImExporterSEPA_Export_008_002_02(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, - GWEN_DB_NODE *params); + GWEN_DB_NODE *params, + int subType); static int AH_ImExporterSEPA_Export_008_003_02(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, - GWEN_DB_NODE *params); + GWEN_DB_NODE *params, + int subType); #endif /* AQHBCI_IMEX_SEPA_P_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/Makefile.am new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/Makefile.am --- old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/Makefile.am 2014-01-19 17:04:43.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/Makefile.am 2014-03-25 22:16:47.000000000 +0100 @@ -42,6 +42,7 @@ updateconf.c \ sepatransfer.c \ sepadebitnote.c \ + sepadebitnotes.c \ separecurtransfer.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/main.c new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/main.c --- old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/main.c 2014-03-01 20:23:15.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/main.c 2014-03-25 22:18:09.000000000 +0100 @@ -48,6 +48,7 @@ #include "sepatransfer.c" #include "addsepadebitnote.c" #include "sepadebitnote.c" +#include "sepadebitnotes.c" #include "separecurtransfer.c" @@ -246,6 +247,8 @@ cmdAddHelpStr(ubuf, "sepadebitnote", I18N("Issue a single SEPA debit note (data from command line)")); + cmdAddHelpStr(ubuf, "sepadebitnotes", + I18N("Issue a number of SEPA debit notes (data from a file)")); cmdAddHelpStr(ubuf, "addtrans", I18N("Add a transfer to an existing import context file")); @@ -369,6 +372,9 @@ else if (strcasecmp(cmd, "sepadebitnote")==0) { rv=sepaDebitNote(ab, db, argc, argv); } + else if (strcasecmp(cmd, "sepadebitnotes")==0) { + rv=sepaDebitNotes(ab, db, argc, argv); + } else if (strcasecmp(cmd, "sepacreatesto")==0) { rv=sepaRecurTransfer(ab, db, argc, argv); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/sepadebitnote.c new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/sepadebitnote.c --- old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/sepadebitnote.c 2014-03-01 21:16:22.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/sepadebitnote.c 2014-03-25 22:47:09.000000000 +0100 @@ -326,7 +326,7 @@ } rv=AB_Banking_CheckIban(lIBAN); if (rv<0) { - DBG_ERROR(0, "Invalid local IBAN (%s)", rIBAN); + DBG_ERROR(0, "Invalid local IBAN (%s)", lIBAN); AB_Transaction_free(t); return 3; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/sepadebitnotes.c new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/sepadebitnotes.c --- old/aqbanking-5.4.1beta/src/tools/aqbanking-cli/sepadebitnotes.c 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.4.2beta/src/tools/aqbanking-cli/sepadebitnotes.c 2014-03-25 22:46:55.000000000 +0100 @@ -0,0 +1,409 @@ +/*************************************************************************** + begin : Tue Mar 25 2014 + copyright : (C) 2014 by Martin Preuss + email : martin(a)libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include "globals.h" + +#include <aqbanking/jobsepadebitnote.h> + +#include <gwenhywfar/text.h> + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> + + + +static +int sepaDebitNotes(AB_BANKING *ab, + GWEN_DB_NODE *dbArgs, + int argc, + char **argv) { + GWEN_DB_NODE *db; + int rv; + const char *ctxFile; + const char *inFile; + const char *importerName; + const char *profileName; + const char *profileFile; + const char *bankId; + const char *accountId; + const char *subAccountId; + int fillGaps; + AB_IMEXPORTER_CONTEXT *ctx=0; + AB_IMEXPORTER_ACCOUNTINFO *iea; + AB_ACCOUNT *forcedAccount=NULL; + AB_JOB_LIST2 *jobList; + int rvExec; + const GWEN_ARGS args[]={ + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "ctxFile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "c", /* short option */ + "ctxfile", /* long option */ + "Specify the file to store the context in", /* short description */ + "Specify the file to store the context in" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "inFile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "f", /* short option */ + "infile", /* long option */ + "Specify the file to read the data from", /* short description */ + "Specify the file to read the data from" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "importerName", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "importer", /* long option */ + "Specify the importer to use", /* short description */ + "Specify the importer to use" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "profileName", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "profile", /* long option */ + "Specify the export profile to use", /* short description */ + "Specify the export profile to use" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "profileFile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "profile-file", /* long option */ + "Specify the file to load the export profile from",/* short description */ + "Specify the file to load the export profile from" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "bankId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "b", /* short option */ + "bank", /* long option */ + "overwrite the bank code", /* short description */ + "overwrite the bank code" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "accountId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "a", /* short option */ + "account", /* long option */ + "overwrite the account number", /* short description */ + "overwrite the account number" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "subAccountId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "aa", /* short option */ + "subaccount", /* long option */ + "Specify the sub account id (Unterkontomerkmal)", /* short description */ + "Specify the sub account id (Unterkontomerkmal)" /* long description */ + }, + { + 0, + GWEN_ArgsType_Int, + "fillGaps", + 0, + 1, + 0, + "fill-gaps", + "let AqBanking fill-in missing account information if possible", + "let AqBanking fill-in missing account information if possible", + }, + { + GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ + GWEN_ArgsType_Int, /* type */ + "help", /* name */ + 0, /* minnum */ + 0, /* maxnum */ + "h", /* short option */ + "help", /* long option */ + "Show this help screen", /* short description */ + "Show this help screen" /* long description */ + } + }; + + db=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, "local"); + rv=GWEN_Args_Check(argc, argv, 1, + 0 /*GWEN_ARGS_MODE_ALLOW_FREEPARAM*/, + args, + db); + if (rv==GWEN_ARGS_RESULT_ERROR) { + fprintf(stderr, "ERROR: Could not parse arguments\n"); + return 1; + } + else if (rv==GWEN_ARGS_RESULT_HELP) { + GWEN_BUFFER *ubuf; + + ubuf=GWEN_Buffer_new(0, 1024, 0, 1); + if (GWEN_Args_Usage(args, ubuf, GWEN_ArgsOutType_Txt)) { + fprintf(stderr, "ERROR: Could not create help string\n"); + return 1; + } + fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(ubuf)); + GWEN_Buffer_free(ubuf); + return 0; + } + + bankId=GWEN_DB_GetCharValue(db, "bankId", 0, 0); + accountId=GWEN_DB_GetCharValue(db, "accountId", 0, 0); + subAccountId=GWEN_DB_GetCharValue(db, "subAccountId", 0, 0); + importerName=GWEN_DB_GetCharValue(db, "importerName", 0, "csv"); + profileName=GWEN_DB_GetCharValue(db, "profileName", 0, "default"); + profileFile=GWEN_DB_GetCharValue(db, "profileFile", 0, NULL); + ctxFile=GWEN_DB_GetCharValue(db, "ctxfile", 0, 0); + fillGaps=GWEN_DB_GetIntValue(db, "fillGaps", 0, 0); + inFile=GWEN_DB_GetCharValue(db, "inFile", 0, 0); + + rv=AB_Banking_Init(ab); + if (rv) { + DBG_ERROR(0, "Error on init (%d)", rv); + return 2; + } + + rv=AB_Banking_OnlineInit(ab); + if (rv) { + DBG_ERROR(0, "Error on init (%d)", rv); + return 2; + } + + /* find local account to set later if requested */ + if (bankId || accountId) { + AB_ACCOUNT_LIST2 *al; + + /* get account */ + al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); + if (al==NULL || AB_Account_List2_GetSize(al)==0) { + DBG_ERROR(0, "Account not found"); + return 2; + } + else if (AB_Account_List2_GetSize(al)>1) { + DBG_ERROR(0, "Ambiguous account specification"); + AB_Account_List2_free(al); + return 2; + } + forcedAccount=AB_Account_List2_GetFront(al); + AB_Account_List2_free(al); + } + + /* import new context */ + ctx=AB_ImExporterContext_new(); + rv=AB_Banking_ImportFileWithProfile(ab, importerName, ctx, + profileName, profileFile, + inFile); + if (rv<0) { + DBG_ERROR(0, "Error reading file: %d", rv); + AB_ImExporterContext_free(ctx); + return 4; + } + + /* fill gaps */ + if (fillGaps) + AB_Banking_FillGapsInImExporterContext(ab, ctx); + + /* populate job list */ + jobList=AB_Job_List2_new(); + iea=AB_ImExporterContext_GetFirstAccountInfo(ctx); + while(iea) { + AB_ACCOUNT *a; + AB_TRANSACTION *t; + + if (forcedAccount) + a=forcedAccount; + else { + a=AB_Banking_GetAccountByCodeAndNumber(ab, + AB_ImExporterAccountInfo_GetBankCode(iea), + AB_ImExporterAccountInfo_GetAccountNumber(iea)); + if (!a) { + DBG_ERROR(0, "Account %s/%s not found, aborting", + AB_ImExporterAccountInfo_GetBankCode(iea), + AB_ImExporterAccountInfo_GetAccountNumber(iea)); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + } + + t=AB_ImExporterAccountInfo_GetFirstTransaction(iea); + while(t) { + AB_JOB *j; + const char *rIBAN; + const char *rBIC; + const char *lIBAN; + const char *lBIC; + + if (forcedAccount) { + AB_Transaction_SetLocalIban(t, AB_Account_GetIBAN(forcedAccount)); + AB_Transaction_SetLocalBic(t, AB_Account_GetBIC(forcedAccount)); + } + + rIBAN=AB_Transaction_GetRemoteIban(t); + rBIC=AB_Transaction_GetRemoteBic(t); + lIBAN=AB_Transaction_GetLocalIban(t); + lBIC=AB_Transaction_GetLocalBic(t); + + /* preset local BIC and IBAN from account, if not set */ + if (!lBIC || !(*lBIC)) + lBIC=AB_Account_GetBIC(a); + + if (!lIBAN || !(*lIBAN)) + lIBAN=AB_Account_GetIBAN(a); + + /* check remote account */ + if (!rBIC || !(*rBIC)) { + DBG_ERROR(0, "Missing remote BIC"); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + if (!rIBAN || !(*rIBAN)) { + DBG_ERROR(0, "Missing remote IBAN"); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + rv=AB_Banking_CheckIban(rIBAN); + if (rv<0) { + DBG_ERROR(0, "Invalid remote IBAN (%s)", rIBAN); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + + /* check local account */ + if (!lBIC || !(*lBIC)) { + DBG_ERROR(0, "Missing local BIC"); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + if (!lIBAN || !(*lIBAN)) { + DBG_ERROR(0, "Missing local IBAN"); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + rv=AB_Banking_CheckIban(lIBAN); + if (rv<0) { + DBG_ERROR(0, "Invalid local IBAN (%s)", lIBAN); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + + /* create job */ + j=AB_JobSepaDebitNote_new(a); + rv=AB_Job_CheckAvailability(j); + if (rv<0) { + DBG_ERROR(0, "Job not supported."); + AB_Job_free(j); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + rv=AB_Job_SetTransaction(j, t); + if (rv<0) { + DBG_ERROR(0, "Unable to add transaction for account %s/%s, aborting", + AB_ImExporterAccountInfo_GetBankCode(iea), + AB_ImExporterAccountInfo_GetAccountNumber(iea)); + AB_Job_free(j); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + AB_Job_List2_PushBack(jobList, j); + t=AB_ImExporterAccountInfo_GetNextTransaction(iea); + } /* while t */ + + iea=AB_ImExporterContext_GetNextAccountInfo(ctx); + } /* while */ + AB_ImExporterContext_free(ctx); + + /* execute jobs */ + rvExec=0; + ctx=AB_ImExporterContext_new(); + rv=AB_Banking_ExecuteJobs(ab, jobList, ctx); + if (rv) { + fprintf(stderr, "Error on executeQueue (%d)\n", rv); + rvExec=3; + } + AB_Job_List2_FreeAll(jobList); + + /* write context */ + rv=writeContext(ctxFile, ctx); + if (rv<0) { + AB_ImExporterContext_free(ctx); + AB_Banking_OnlineFini(ab); + AB_Banking_Fini(ab); + return 4; + } + AB_ImExporterContext_free(ctx); + + /* that's is */ + rv=AB_Banking_OnlineFini(ab); + if (rv) { + fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); + AB_Banking_Fini(ab); + if (rvExec) + return rvExec; + else + return 5; + } + + rv=AB_Banking_Fini(ab); + if (rv) { + fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); + if (rvExec) + return rvExec; + else + return 5; + } + + if (rvExec) + return rvExec; + else + return 0; +} + + + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/aqbanking-5.4.1beta/version.h new/aqbanking-5.4.2beta/version.h --- old/aqbanking-5.4.1beta/version.h 2014-03-02 15:47:28.000000000 +0100 +++ new/aqbanking-5.4.2beta/version.h 2014-03-30 21:53:30.000000000 +0200 @@ -13,15 +13,15 @@ #define AQBANKING_VERSION_MAJOR 5 #define AQBANKING_VERSION_MINOR 4 -#define AQBANKING_VERSION_PATCHLEVEL 1 +#define AQBANKING_VERSION_PATCHLEVEL 2 #define AQBANKING_VERSION_BUILD 0 #define AQBANKING_VERSION_TAG "beta" -#define AQBANKING_VERSION_FULL_STRING "5.4.1.0beta" -#define AQBANKING_VERSION_STRING "5.4.1" +#define AQBANKING_VERSION_FULL_STRING "5.4.2.0beta" +#define AQBANKING_VERSION_STRING "5.4.2" #define AQBANKING_SO_CURRENT 38 -#define AQBANKING_SO_REVISION 1 +#define AQBANKING_SO_REVISION 2 #define AQBANKING_SO_AGE 4 #define AQBANKING_SO_EFFECTIVE 34 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icewm.2683 for openSUSE:13.1:Update
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package icewm.2683 for openSUSE:13.1:Update checked in at 2014-03-31 10:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/icewm.2683 (Old) and /work/SRC/openSUSE:13.1:Update/.icewm.2683.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icewm.2683" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:13.1:Update/.icewm.2683.new/icewm.changes 2014-03-31 10:57:51.000000000 +0200 @@ -0,0 +1,651 @@ +------------------------------------------------------------------- +Fri Mar 21 15:46:43 UTC 2014 - msrb(a)suse.com + +- icewm-fix-themes.patch + * Workaround for bnc#856931. + +------------------------------------------------------------------- +Thu Mar 28 08:59:08 UTC 2013 - mmeister(a)suse.com + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- +Tue May 22 10:25:52 UTC 2012 - idonmez(a)suse.com + +- Fix build with gcc 4.7 +- Fix build with new X11 headers + +------------------------------------------------------------------- +Tue Dec 20 20:49:49 UTC 2011 - coolo(a)suse.com + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Aug 29 21:52:18 UTC 2011 - crrodriguez(a)opensuse.org + +- Must link with -lfontconfig too, fix build. + +------------------------------------------------------------------- +Tue Apr 26 11:02:56 UTC 2011 - mmarek(a)novell.com + +- Change the command to apply icewm-preferences.patch to make + automatic checks happy. + +------------------------------------------------------------------- +Mon Mar 21 10:58:16 UTC 2011 - mmarek(a)novell.com + +- Fix shutdown and reboot (bnc#681126). + +------------------------------------------------------------------- +Mon Mar 21 10:46:09 UTC 2011 - mmarek(a)novell.com + +- Update to 1.3.7: + * battery status as graphics not text (Alexander Drozdov) + * 'icewm-set-gnomewm' script to set GNOME window manager to icewm + * bugfixes + +------------------------------------------------------------------- +Wed Sep 8 03:06:27 CEST 2010 - vuntz(a)opensuse.org + +- Change old-style BuildRequires to pkgconfig() style + BuildRequires: + + old-style: gnome-desktop-devel, libgnomeui-devel. + + new-style: gdk-pixbuf-xlib-2.0, gnome-desktop-2.0, + libgnomeui-2.0. +- This will make it easier to switch to GNOME 3 libraries. + +------------------------------------------------------------------- +Tue Jan 26 16:10:38 CET 2010 - mmarek(a)suse.cz + +- fix applying of custom window options. + +------------------------------------------------------------------- +Tue Jan 26 13:39:57 CET 2010 - mmarek(a)suse.cz + +- update to 1.3.6 + * XRANDR support + * uses gdk-pixbuf instead of imlib + +------------------------------------------------------------------- +Mon Sep 7 16:08:32 CEST 2009 - mmarek(a)suse.cz + +- icewm-1.2.38pre1-bad-delete.patch: fix for bnc#525804 + +------------------------------------------------------------------- +Wed Apr 29 17:03:41 CEST 2009 - mmarek(a)suse.cz + +- updated to 1.2.38pre1 + * bugfixes + +------------------------------------------------------------------- +Mon Feb 23 00:16:09 CET 2009 - vuntz(a)novell.com + +- Add icewm-1.2.36-gnome-compilation.patch to fix build. The patch + should probably be sent upstream. +- Add libgnomeui-devel BuildRequires for the patch. + +------------------------------------------------------------------- +Fri Oct 24 23:29:21 CEST 2008 - mmarek(a)suse.de + +- updated to 1.2.36 final + * add option TaskBarFullscreenAutoShow (default = 1) + * fixes --with-line build + +------------------------------------------------------------------- +Mon Sep 29 16:08:25 CEST 2008 - mmarek(a)suse.cz + +- fixed unaligned access in XChangeProperly() + +------------------------------------------------------------------- +Thu Sep 11 12:15:06 CEST 2008 - mmarek(a)suse.cz + +- updated to 1.2.36pre2 + * add support for sysfs interface (instead of proc) for battery + status (initial code by Santiago Garcia Mantinan) + * bugfixes & translation updates + +------------------------------------------------------------------- +Fri Jul 18 17:49:35 CEST 2008 - mmarek(a)suse.cz + +- also fix session locking (use xscreensaver or xlock) (bnc#406156) + +------------------------------------------------------------------- +Fri Jul 18 17:10:36 CEST 2008 - mmarek(a)suse.cz + +- make shutdown and reboot work out of the box (bnc#406156) + +------------------------------------------------------------------- +Fri Mar 7 13:36:51 CET 2008 - mmarek(a)suse.cz + +- don't popup empty window menu + +------------------------------------------------------------------- +Fri Feb 29 11:27:23 CET 2008 - mmarek(a)suse.cz + +- fixed centering of dialogs (bnc#359529) + +------------------------------------------------------------------- +Tue Jan 29 14:34:44 CET 2008 - mmarek(a)suse.cz + +- make icewm --config=file work + (override-config.patch) + +------------------------------------------------------------------- +Mon Jan 28 10:23:43 CET 2008 - mmarek(a)suse.cz + +- updated to 1.2.35 + * Application tray bug fixes + * Add encoding/language to about dialog + * fix gmplayer switching to fullscreen + * popup dialog focus fixes + * fix screen change with xrandr 1.2 + * build fixes (Bert Wesarg) + * fix FocusOnRaise + * tray fixes + * fix taskbar popup in fullscreen mode +- don't install genpref (only needed at build time) +- fixed build for older distributions in X11:windowmanagers +- use %%suse_update_desktop_file + +------------------------------------------------------------------- +Mon Aug 13 11:43:13 CEST 2007 - mmarek(a)suse.cz + +- updated to 1.2.32 [#299583] + * auto-hide like taskbar activation in full screen mode added + * missing ShowSettingsMenu and ShowFocusModeMenu + settings (Evgenii Terechkov) + * binding to raise window with mouse + (MouseWinRaise=Ctrl+Alt+Mouse1) (Thomas Holder) + * translation updates (cs, ru, zh_CN, zh_TW) + * bugfixes +- link duplicate theme icons + +------------------------------------------------------------------- +Sat Mar 3 13:07:13 CET 2007 - aj(a)suse.de + +- /usr/share/xsessions/ is part of filesystems now. + +------------------------------------------------------------------- +Wed Jan 24 16:48:24 CET 2007 - mmarek(a)suse.cz + +- fixed strict aliasing warning + +------------------------------------------------------------------- +Fri Jan 12 09:35:23 CET 2007 - mmarek(a)suse.cz + +- fix last change (Start -> Help didn't work) + (icewm-docdir.patch) + +------------------------------------------------------------------- +Thu Jan 11 12:20:35 CET 2007 - mmarek(a)suse.cz + +- updated to 1.2.30 + + battery status cleanups + + new option BatteryPollingPeriod (default 10 seconds) + + moved Themes selection to Settings menu + + added Settings -> Focus menu (config saved to + ~/.icewm/focus_mode as FocusMode=1,2 or 0) + + new setting MapInactiveOnTop (default 1) + + new setting RequestFocusOnAppRaise (when FocusOnAppRaise=0) + + altgr_binding_support by Jörg Sommer + + Apple PMU support by Jörg Sommer + + start menu pixmap now named: taskbar/start.xpm + + try to mouse focus only when mouse actually moves to another + window + + prevent focusing taskbar with mouse focus + + use locale strings in 'icewm-menu-gnome2' ++++ 454 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.icewm.2683.new/icewm.changes New: ---- icewm-1.2.35-empty-winmenu.patch icewm-1.2.35-override-config.patch icewm-1.2.35-unaligned-access.patch icewm-1.3.6-winoptions.patch icewm-1.3.7.tar.gz icewm-docdir.patch icewm-fix-themes.patch icewm-gcc47.patch icewm-linking.patch icewm-menu.patch icewm-multiByte.patch icewm-preferences.patch icewm-x11.patch icewm.changes icewm.desktop icewm.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ # # spec file for package icewm # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: icewm BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: gnome-desktop-devel BuildRequires: libgnomeui-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) BuildRequires: pkgconfig(gnome-desktop-2.0) BuildRequires: pkgconfig(libgnomeui-2.0) %if 0%{?suse_version} >= 1030 BuildRequires: fdupes %endif Provides: windowmanager Requires: desktop-data Requires: icewm-bin Requires: xdg-menu Version: 1.3.7 Release: 0 Source: http://downloads.sourceforge.net/project/%{name}/%{name}-1.3/%{version}/%{n… Source1: %{name}.desktop Patch1: icewm-multiByte.patch Patch2: icewm-menu.patch Patch3: icewm-docdir.patch Patch4: icewm-1.2.35-override-config.patch Patch5: icewm-1.2.35-empty-winmenu.patch Patch6: icewm-1.2.35-unaligned-access.patch Patch7: icewm-1.3.6-winoptions.patch Patch8: icewm-linking.patch Patch9: icewm-gcc47.patch Patch10: icewm-x11.patch Patch11: icewm-fix-themes.patch # applied in %%build Patch99: icewm-preferences.patch Url: http://www.icewm.org/ Summary: Window Manager with a Taskbar License: LGPL-2.1+ Group: System/GUI/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A window manager for the X Window System that can emulate the look of Windows '95, OS/2 Warp 3, OS/2 Warp 4, and Motif and tries to take the best features from those systems. IceWM features multiple workspaces, opaque move and resize, a taskbar, a window list, mailbox status, and a digital clock. It is fast and small. Authors: -------- Marko Macek <Marko.Macek(a)gmx.net> %package default Summary: Window Manager with a Taskbar--Default Version Group: System/GUI/Other Provides: icewm-bin Requires: icewm Conflicts: icewm-lite %description default A window manager for the X Window System that can emulate the look of Windows '95, OS/2 Warp 3, OS/2 Warp 4, and Motif and tries to take the best features from those systems. IceWM features multiple workspaces, opaque move and resize, a taskbar, a window list, mailbox status, and a digital clock. It is fast and small. Authors: -------- Marko Macek <Marko.Macek(a)gmx.net> %package gnome Summary: Windowmanager with Taskbar - gnome version Group: System/GUI/GNOME Requires: icewm-default %description gnome Window Manager for X Window System. Can emulate the look of Windows 95, OS/2 Warp 3,4, Motif. Tries to take the best features of the above systems. Features multiple workspaces, opaque move and resize, task bar, window list, mailbox status, digital clock. Fast and small. This package adds GNOME menu and sound support to icewm. Authors: -------- Marko Macek <Marko.Macek(a)gmx.net> %prep %setup -q %patch1 %patch2 %patch3 %patch4 %patch5 %patch6 %patch7 -p1 %patch8 %patch9 -p1 %patch10 -p1 %patch11 -p1 %build autoconf export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" # needed for 10.[12] builds in the bs export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig ./configure --disable-silent-rules --without-debug \ --sysconfdir=/etc \ --with-cfgdir=/etc/icewm \ --prefix=/usr \ --with-docdir=%{_docdir} \ --enable-i18n \ --enable-nls \ --enable-corefonts \ --enable-guievents \ --enable-antialiasing \ --enable-gradients \ --enable-shaped-decorations \ --with-icesound=oss,esd \ --with-imlib \ --enable-menus-gnome2 make %{?jobs:-j%jobs} V=1 # patch generated lib/preferences file patch -p0 -i %{P:99} %install make DESTDIR=$RPM_BUILD_ROOT install install-docs mkdir -p $RPM_BUILD_ROOT/etc/icewm for cfgfile in keys menu preferences toolbar winoptions ; do mv $RPM_BUILD_ROOT/usr/share/icewm/$cfgfile \ $RPM_BUILD_ROOT/etc/icewm done %{find_lang} icewm ln -s icewm.html $RPM_BUILD_ROOT/%{_docdir}/icewm/index.html # install the xsession desktop file mkdir -p $RPM_BUILD_ROOT/usr/share/xsessions cp -f %{SOURCE1} $RPM_BUILD_ROOT/usr/share/xsessions %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/icewm.desktop # link duplicate theme icons to save some space %{?fdupes:%fdupes %buildroot/usr/share/icewm/themes/} %clean rm -rf $RPM_BUILD_ROOT; %files -f icewm.lang %defattr(-,root,root) %doc %{_docdir}/icewm %dir /etc/icewm %config /etc/icewm/* /usr/share/icewm/ /usr/share/xsessions/* %files default %defattr(-,root,root) /usr/bin/icewm /usr/bin/icewmhint /usr/bin/icewmbg /usr/bin/icehelp /usr/bin/icesh /usr/bin/icewmtray /usr/bin/icewm-session %files gnome %defattr(-,root,root) /usr/bin/icesound /usr/bin/icewm-menu-gnome2 /usr/bin/icewm-set-gnomewm %changelog ++++++ icewm-1.2.35-empty-winmenu.patch ++++++ Should be fixed in YMenu / YPopupWindow for all menus, but we need it now for the window menu (to disable it in the installation icewm) --- src/wmframe.cc | 2 ++ 1 file changed, 2 insertions(+) Index: src/wmframe.cc =================================================================== --- src/wmframe.cc.orig +++ src/wmframe.cc @@ -2017,6 +2017,8 @@ void YFrameWindow::popupSystemMenu(YWind { if (fPopupActive == 0) { updateMenu(); + if (windowMenu()->itemCount() == 0) + return; if (windowMenu()->popup(owner, forWindow, this, x, y, flags)) fPopupActive = windowMenu(); ++++++ icewm-1.2.35-override-config.patch ++++++ make icewm --config=preferences.xy work, i.e. load /etc/icewm/preferences.xy --- src/wmapp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: src/wmapp.cc =================================================================== --- src/wmapp.cc.orig +++ src/wmapp.cc @@ -1142,7 +1142,7 @@ YWMApp::YWMApp(int *argc, char ***argv, managerWindow = None; #ifndef NO_CONFIGURE - loadConfiguration("preferences"); + loadConfiguration(configFile ? configFile : "preferences"); if (themeName != 0) { MSG(("themeName=%s", themeName)); ++++++ icewm-1.2.35-unaligned-access.patch ++++++ --- src/wmapp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/wmapp.cc.orig +++ src/wmapp.cc @@ -218,7 +218,7 @@ static void registerProtocols2(Window xi PropModeReplace, (unsigned char *)win_proto, i); #endif - pid_t pid = getpid(); + XID pid = getpid(); const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"; #ifdef GNOME1_HINTS ++++++ icewm-1.3.6-winoptions.patch ++++++ --- src/wmframe.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- icewm-1.3.6.orig/src/wmframe.cc +++ icewm-1.3.6/src/wmframe.cc @@ -2264,15 +2264,15 @@ void YFrameWindow::getWindowOptions(Wind if (name != null) { ustring klass_instance = name.append(".").append(klass); list->mergeWindowOption(opt, klass_instance, remove); - } else - list->mergeWindowOption(opt, klass, remove); + } + list->mergeWindowOption(opt, klass, remove); } if (name != null) { if (role != null) { ustring name_role = name.append(".").append(role); list->mergeWindowOption(opt, name_role, remove); - } else - list->mergeWindowOption(opt, name, remove); + } + list->mergeWindowOption(opt, name, remove); } if (role != null) list->mergeWindowOption(opt, role, remove); ++++++ icewm-docdir.patch ++++++ --- Makefile.in | 10 +++++----- src/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) --- Makefile.in.orig +++ Makefile.in @@ -116,12 +116,12 @@ install-base: base install-docs: docs @echo ------------------------------------------ - @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" - @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" + @rm -fr "$(DESTDIR)$(DOCDIR)/icewm" + @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm" @echo "Installing documentation in $(DESTDIR)$(DOCDIR)" - @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" - @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" - @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" + @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm" + @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm" + @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm" @echo ------------------------------------------ install-nls: nls --- src/Makefile.in.orig +++ src/Makefile.in @@ -32,7 +32,7 @@ DEFS = @DEFS@ \ -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ -DICESMEXE='"icewm-session$(EXEEXT)"' \ -DICEHELPEXE='"icehelp$(EXEEXT)"' \ - -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' + -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` ++++++ icewm-fix-themes.patch ++++++ This is workaround for bnc#856931. The "None" color is not used and causes the title to be invisible due to bug in Xserver/libgdk. diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleAB.xpm icewm-1.3.8/lib/themes/icedesert/titleAB.xpm --- icewm-1.3.8.orig/lib/themes/icedesert/titleAB.xpm 2014-03-03 14:04:45.087165548 +0200 +++ icewm-1.3.8/lib/themes/icedesert/titleAB.xpm 2014-03-03 14:05:27.926953675 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAB_xpm[] = { -"1 20 20 1", -" c None", +"1 20 19 1", ". c #FFFFFF", "+ c #FDFBFA", "@ c #FBF8F5", diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleAT.xpm icewm-1.3.8/lib/themes/icedesert/titleAT.xpm --- icewm-1.3.8.orig/lib/themes/icedesert/titleAT.xpm 2014-03-03 14:04:45.086165483 +0200 +++ icewm-1.3.8/lib/themes/icedesert/titleAT.xpm 2014-03-03 14:05:36.371503268 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAT_xpm[] = { -"1 20 20 1", -" c None", +"1 20 19 1", ". c #FFFFFF", "+ c #FDFBFA", "@ c #FBF8F5", diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleIB.xpm icewm-1.3.8/lib/themes/icedesert/titleIB.xpm --- icewm-1.3.8.orig/lib/themes/icedesert/titleIB.xpm 2014-03-03 14:04:45.086165483 +0200 +++ icewm-1.3.8/lib/themes/icedesert/titleIB.xpm 2014-03-03 14:05:44.591038217 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleIB_xpm[] = { -"1 20 20 1", -" c None", +"1 20 19 1", ". c #FFFFFF", "+ c #FBFBFB", "@ c #F8F8F8", diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleIT.xpm icewm-1.3.8/lib/themes/icedesert/titleIT.xpm --- icewm-1.3.8.orig/lib/themes/icedesert/titleIT.xpm 2014-03-03 14:04:45.086165483 +0200 +++ icewm-1.3.8/lib/themes/icedesert/titleIT.xpm 2014-03-03 14:05:54.318671317 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleIT_xpm[] = { -"1 20 20 1", -" c None", +"1 20 19 1", ". c #FFFFFF", "+ c #FBFBFB", "@ c #F8F8F8", diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleAB.xpm icewm-1.3.8/lib/themes/Infadel2/titleAB.xpm --- icewm-1.3.8.orig/lib/themes/Infadel2/titleAB.xpm 2014-03-03 14:04:45.089165678 +0200 +++ icewm-1.3.8/lib/themes/Infadel2/titleAB.xpm 2014-03-03 14:06:37.815502206 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAS_xpm[] = { -"1 17 12 1", -" c None", +"1 17 11 1", ". c #868687", "+ c #9A9A9B", "@ c #AEAEAF", diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleAS.xpm icewm-1.3.8/lib/themes/Infadel2/titleAS.xpm --- icewm-1.3.8.orig/lib/themes/Infadel2/titleAS.xpm 2014-03-03 14:04:45.089165678 +0200 +++ icewm-1.3.8/lib/themes/Infadel2/titleAS.xpm 2014-03-03 14:06:43.555875804 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAS_xpm[] = { -"1 17 12 1", -" c None", +"1 17 11 1", ". c #868687", "+ c #9A9A9B", "@ c #AEAEAF", diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleAT.xpm icewm-1.3.8/lib/themes/Infadel2/titleAT.xpm --- icewm-1.3.8.orig/lib/themes/Infadel2/titleAT.xpm 2014-03-03 14:04:45.088165613 +0200 +++ icewm-1.3.8/lib/themes/Infadel2/titleAT.xpm 2014-03-03 14:06:50.628336098 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAT_xpm[] = { -"1 17 18 1", -" c None", +"1 17 17 1", ". c #868687", "+ c #484848", "@ c #344066", diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleIB.xpm icewm-1.3.8/lib/themes/Infadel2/titleIB.xpm --- icewm-1.3.8.orig/lib/themes/Infadel2/titleIB.xpm 2014-03-03 14:04:45.089165678 +0200 +++ icewm-1.3.8/lib/themes/Infadel2/titleIB.xpm 2014-03-03 14:06:56.526719980 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAS_xpm[] = { -"1 17 12 1", -" c None", +"1 17 11 1", ". c #868687", "+ c #9A9A9B", "@ c #AEAEAF", diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleIS.xpm icewm-1.3.8/lib/themes/Infadel2/titleIS.xpm --- icewm-1.3.8.orig/lib/themes/Infadel2/titleIS.xpm 2014-03-03 14:04:45.089165678 +0200 +++ icewm-1.3.8/lib/themes/Infadel2/titleIS.xpm 2014-03-03 14:07:03.445170251 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleAS_xpm[] = { -"1 17 12 1", -" c None", +"1 17 11 1", ". c #868687", "+ c #9A9A9B", "@ c #AEAEAF", diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleIT.xpm icewm-1.3.8/lib/themes/Infadel2/titleIT.xpm --- icewm-1.3.8.orig/lib/themes/Infadel2/titleIT.xpm 2014-03-03 14:04:45.089165678 +0200 +++ icewm-1.3.8/lib/themes/Infadel2/titleIT.xpm 2014-03-03 14:07:09.963594488 +0200 @@ -1,7 +1,6 @@ /* XPM */ static char * titleIT_xpm[] = { -"1 17 18 1", -" c None", +"1 17 17 1", ". c #868686", "+ c #484848", "@ c #4D4D4D", ++++++ icewm-gcc47.patch ++++++ Index: icewm-1.3.7/src/yarray.h =================================================================== --- icewm-1.3.7.orig/src/yarray.h +++ icewm-1.3.7/src/yarray.h @@ -152,7 +152,7 @@ public: } virtual void remove(const typename YArray<DataType *>::SizeType index) { - if (index < YArray<DataType *>::getCount()) delete getItem(index); + if (index < YArray<DataType *>::getCount()) delete this->getItem(index); YArray<DataType *>::remove(index); } ++++++ icewm-linking.patch ++++++ --- src/Makefile.in.orig +++ src/Makefile.in @@ -37,9 +37,9 @@ DEFS = @DEFS@ \ CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` LFLAGS = @LDFLAGS@ -LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` +LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -CORE_LIBS = @CORE_LIBS@ # `fc-config --libs` +CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs` IMAGE_LIBS = @IMAGE_LIBS@ AUDIO_LIBS = @AUDIO_LIBS@ GNOME1_LIBS = @GNOME1_LIBS@ @@ -207,29 +207,29 @@ clean: %.o: %.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< + $(CXX) $(CXXFLAGS) $(GCCDEP) -c $< $(BINARIES): @echo " LD " $@ - @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS) + $(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS) genpref.o: genpref.cc @echo " HOSTCXX " $@ - @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< + $(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< genpref$(EXEEXT): @echo " HOSTLD " $@ - @$(HOSTLD) -o $@ $(genpref_OBJS) + $(HOSTLD) -o $@ $(genpref_OBJS) ################################################################################ gnome.o: gnome.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $< + $(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $< gnome2.o: gnome2.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $< + $(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $< ################################################################################ ++++++ icewm-menu.patch ++++++ --- lib/menu.in 2003-09-27 09:54:45.000000000 +0200 +++ lib/menu.in 2004-03-11 22:59:14.000000000 +0100 @@ -5,6 +5,8 @@ # (re)install icewm. # prog xterm xterm xterm +prog mlterm xterm mlterm +prog xiterm xterm xiterm prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 prog fte fte fte prog NEdit nedit nedit @@ -12,8 +14,4 @@ prog XChat xchat xchat prog Gimp gimp gimp separator -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ -menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ -menufile Programs folder programs -menufile Tool_bar folder toolbar +menuprog SUSE folder xdg_menu --format icewm ++++++ icewm-multiByte.patch ++++++ Index: src/ylocale.cc =================================================================== --- src/ylocale.cc.orig +++ src/ylocale.cc @@ -47,8 +47,7 @@ YLocale::YLocale(char const * localeName "Falling back to 'C' locale'.")); fLocaleName = setlocale(LC_ALL, "C"); } -#warning "P1 should always use multibyte/fontset if I18N" - multiByte = (MB_CUR_MAX > 1); + multiByte = true; char const * codeset = NULL; int const codesetItems[] = { CONFIG_NL_CODESETS }; ++++++ icewm-preferences.patch ++++++ Tweak default icewm preferences Attention: this patch is applied in the %build phase, because it patches a file generated by ./src/genpref. To edit the patch: quilt setup icewm.spec cd icewm-<version> quilt push -a ./configure <options from the spec> make -C src genpref ./src/genpref >lib/preferences quilt import -p0 patches/icewm-preferences.patch quilt push vi lib/preferences quilt refresh --- lib/preferences | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- lib/preferences.orig +++ lib/preferences @@ -509,7 +509,7 @@ # NewMailCommand="" # Command to lock display/screensaver -# LockCommand="" +LockCommand="xscreensaver-command -lock || xlock -mousemotion" # Command to run on clock # ClockCommand="xclock -name icewm -title Clock" @@ -533,10 +533,10 @@ # LogoutCancelCommand="" # Command to shutdown the system -# ShutdownCommand="" +ShutdownCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop" # Command to reboot the system -# RebootCommand="" +RebootCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Restart" # Command to run on CPU status # CPUStatusCommand="xterm -name top -title Process\ Status -e top" @@ -1280,19 +1280,19 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4 # # Display desktop background centered and not tiled -# DesktopBackgroundCenter=0 # 0/1 +DesktopBackgroundCenter=1 # 0/1 # Support for semitransparent terminals like Eterm or gnome-terminal # SupportSemitransparency=1 # 0/1 # Desktop background scaled to full screen -# DesktopBackgroundScaled=0 # 0/1 +DesktopBackgroundScaled=1 # 0/1 # Desktop background color # DesktopBackgroundColor="rgb:00/20/40" # Desktop background image -# DesktopBackgroundImage="" +DesktopBackgroundImage="/usr/share/wallpapers/default-1600x1200.jpg" # Color to announce for semi-transparent windows # DesktopTransparencyColor="" ++++++ icewm-x11.patch ++++++ Description: Don't use "deprecated" as identifier, will FTBFS if another library defines functions as deprecated. Author: Andreas Moog <amoog(a)ubuntu.com> Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=1… Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179 Forwarded: Yes --- icewm-1.3.7.orig/src/base.h +++ icewm-1.3.7/src/base.h @@ -2,9 +2,9 @@ #define __BASE_H #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 -#define deprecated __attribute__((deprecated)) +#define ICEWM_deprecated __attribute__((deprecated)) #else -#define deprecated +#define ICEWM_deprecated #endif /*** Atomar Data Types ********************************************************/ ++++++ icewm.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Type=XSession Exec=icewm-session TryExec=icewm-session Name=IceWM Name[af]=Icewm Name[eo]=GlaciFA Name[hi]=आइस-डबल्यूएम Name[lo]=ຕົວຈັດການຫນ້າຕ່າງ IceWM Name[sv]=Ice WM Name[th]=ตัวจัดการหน้าต่าง IceWM Name[xx]=xxIceWMxx Comment=A Windows 95-OS/2-Motif-like window manager Comment[ar]=مدير نوافذ مشابه لـ Win95-OS/2-Motif Comment[be]=Кіраваньне вокнамі падобнае на Windows 95-OS/2-Motif Comment[bn]=Windows 95-OS/2-Motif-এর অনুরূপ একটি উইণ্ডো ম্যানেজার Comment[bs]=Window manager nalik na Windows 95-OS/2-Motif Comment[ca]=Un gestor de finestres com els de Windows 95-OS/2-Motif Comment[cs]=Správce oken podobný Windows 95-OS/2-Motif Comment[cy]=Trefnydd ffenestri sy'n debyg i Windows95-OS/2-Motif Comment[da]=En Windows 95-OS/2-Motif-lignende vindueshåndtering Comment[de]=Fenstermanager im Stil von Windows 95, OS/2 und Motif Comment[el]=Ένας διαχειριστής παραθύρων παρόμοιος με τα Windows 95-OS/2-Motif Comment[eo]=Fenestroadministrilo kiel Vindozo 95, OS/2 kaj Motifo Comment[es]=Un administrador de ventanas similar a Win95-OS/2-Motif Comment[et]=Aknahaldur, mis näeb välja nagu Windows 95-OS/2-Motif Comment[eu]=Windows 95 OS/2 Motif-en itxura duen leiho kudeatzailea Comment[fi]=Windows 95:n ja OS/2-Motifin tyylinen ikkunaohjelma Comment[fr]=Un gestionnaire de fenêtres ressemblant à Windows 95-OS/2-Motif Comment[fy]=In Win95-OS/2-Motif-likens finstersmanager Comment[gl]=Un xestor de fiestras coma o de Windows 95-OS/2-Motif Comment[he]=מנהל חלונות מבוסס Motif הדומה במראהו לחלונות 95/OS-2 Comment[hi]=विंडोज़ 95-ओएस/2-मोटिफ जैसा विंडो प्रबंधक Comment[hr]=Upravitelj prozora nalik na Windows 95/OS/2/Motif Comment[hu]=Win95-OS/2-Motif-szerű ablakkezelő Comment[is]=Gluggastjóri sem líkist 95-OS/2-Motif Comment[it]=Un window manager in stile Windows 95-OS/2-Motif Comment[ja]=Windows95,OS/2,Motifに似たウィンドウマネージャ Comment[lt]=A Windows 95-OS/2-Motif-primenanti langų tvarkyklė Comment[lv]=Windows 95 - OS/2 - Motif līdzīgs logu menedžeris Comment[mk]=Менаџер на прозорци со изглед на Windows 95, OS/2 и Motif Comment[mn]=Виндовс 95-OS/2-Motif-шиг цонхны удирдагч Comment[mt]=Window manager jixbaħ lill-Windows 95-OS/2-Motif Comment[nb]=En vindusbehandler som likner Windows 95-OS/2-Motif Comment[nds]=Finsterpleger, de utsüht as Windows 95-OS/2-Motif Comment[nl]=Een Win95-OS/2-Motif-achtige windowmanager Comment[nn]=Ein vindaugssjef som liknar Windows 95-OS/2-Motif Comment[pa]=ਇੱਕ ਵਿੰਡੋ 95-OS/2-Motif-ਵਰਗਾ ਝਰੋਖਾ ਮੈਨੇਜਰ Comment[pl]=Menedżer okien podobny do Windows 95-OS/2-Motif Comment[pt]=Um gestor de janelas parecido com o Windows 95, OS/2 e Motif Comment[pt_BR]=Um gerenciador de janelas parecido com Windows 95-OS/2-Motif Comment[ro]=Un manager de ferestre cu aspect de Windows 95, OS/2 sau Motif Comment[ru]=Оконный менеджер в стиле Windows95-OS/2-Motif Comment[se]=Windows 95-OS/2-Motif-lágan lásegieđahalli Comment[sk]=Správca okien podobný Windows 95-OS/2-Motif Comment[sl]=Okenski upravitelj, podoben Windows 95, OS/2 in Motifu Comment[sr]=Менаџер прозора налик на Windows 95/OS/2/Motif Comment[sr@Latn]=Menadžer prozora nalik na Windows 95/OS/2/Motif Comment[sv]=Fönsterhanterare som liknar Windows 95-OS/2-Motif Comment[ta]=சாளரங்கள் 95-OS/2-மாடிஃப்-லைக் சாளர மேலாளர் Comment[tg]=Windows 95-OS/2-Motif-монанди мудири тиреза Comment[tr]=Windows 95-OS/2-Motif benzeri bir pencere yöneticisi Comment[uk]=Менеджер вікон наподіб Windows 95-OS/2-Motif Comment[uz]=Win95-OS/2-Motif'га ўхшаш ойна бошқарувчи Comment[vi]=Trình quản lý cửa sổ với mô típ kiểu Windows 95 Comment[wa]=On manaedjeu di purneas rishonnant Windows95-OS/2-Motif Comment[xx]=xxA Windows 95-OS/2-Motif-like window managerxx Comment[zh_CN]=类似 Windows-OS/2-Motif 的窗口管理器 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mlocate for openSUSE:13.1:Update
by root＠hilbert.suse.de 31 Mar '14

31 Mar '14

Hello community, here is the log from the commit of package mlocate for openSUSE:13.1:Update checked in at 2014-03-31 10:56:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/mlocate (Old) and /work/SRC/openSUSE:13.1:Update/.mlocate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mlocate" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.kcQoB8/_old 2014-03-31 10:56:21.000000000 +0200 +++ /var/tmp/diff_new_pack.kcQoB8/_new 2014-03-31 10:56:21.000000000 +0200 @@ -1 +1 @@ -<link package='mlocate.2163' cicount='copy' /> +<link package='mlocate.2682' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit equalx for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '14

30 Mar '14

Hello community, here is the log from the commit of package equalx for openSUSE:Factory checked in at 2014-03-30 12:13:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/equalx (Old) and /work/SRC/openSUSE:Factory/.equalx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "equalx" Changes: -------- --- /work/SRC/openSUSE:Factory/equalx/equalx.changes 2014-03-28 12:10:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.equalx.new/equalx.changes 2014-03-30 12:52:58.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 26 21:55:57 UTC 2014 - badshah400(a)gmail.com + +- Update to version 0.7.1: + + No list of changes from upstream + + Build process changed: make install no longer does anything; + use 'install' to manually copy generated binary to %{_bindir} + instead +- Use desktop file shipped in upstream tarball + + Drop external .desktop file + + Add equalx-fix-desktop-file.patch: Fix icon tag in shipped + desktop file and categories for compatibility with openSUSE + defined ones; also fix incorrect Version tag usage +- Add BuildRequires on inkscape too, required for generation of + proper hi-res png icons from svg icon file. + +------------------------------------------------------------------- Old: ---- equalx-0.7.0.tar.gz equalx.desktop New: ---- equalx-0.7.1.tar.gz equalx-fix-desktop-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ equalx.spec ++++++ --- /var/tmp/diff_new_pack.mZCXZw/_old 2014-03-30 12:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.mZCXZw/_new 2014-03-30 12:52:59.000000000 +0200 @@ -17,19 +17,21 @@ Name: equalx -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Editor for writing and exporting TeX/LaTeX equations License: GPL-3.0+ Group: Productivity/Publishing/TeX/Frontends Url: http://equalx.sourceforge.net/ Source0: http://downloads.sourceforge.net/equalx/%{name}-%{version}.tar.gz -Source1: %{name}.desktop +# PATCH-FIX-OPENSUSE equalx-fix-desktop-file.patch badshah400(a)gmail.com -- Fix icon tag in desktop file and categories for compatibility with openSUSE defined ones +Patch0: equalx-fix-desktop-file.patch BuildRequires: ImageMagick BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: ghostscript BuildRequires: hicolor-icon-theme +BuildRequires: inkscape BuildRequires: libqt4-devel >= 4.8.0 BuildRequires: pkg-config BuildRequires: pkgconfig(exempi-2.0) @@ -54,14 +56,15 @@ %prep %setup -q +%patch0 -p1 sed -i 's/\r$//' LICENSE README %build -qmake QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags" +qmake DESTDIR="./bin/" QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags" make %{?_smp_mflags} %install -make INSTALL_ROOT=%{buildroot} install +install -D -p bin/%{name} %{buildroot}%{_bindir}/%{name} # GENERATE HI-RES APPLICATION ICONS pushd resources/icons/equalx @@ -86,7 +89,9 @@ ln -s %{_datadir}/%{name}/resources/icons/equalx/equalx.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/equalx.svg -desktop-file-install %{SOURCE1} +desktop-file-install resources/%{name}.desktop +# REMOVE UNUSED DESKTOP FILE +rm %{buildroot}%{_datadir}/%{name}/resources/%{name}.desktop %fdupes %{buildroot}%{_datadir}/%{name} @@ -100,7 +105,7 @@ %files %defattr(-,root,root) -%doc changelog README LICENSE +%doc changelog README LICENSE THANKS %{_bindir}/%{name} # OWN THE 512x512 ICON DIR AS HICOLOR THEME DOES NOT PROVIDE IT YET %dir %{_datadir}/icons/hicolor/512x512 ++++++ equalx-0.7.0.tar.gz -> equalx-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/equalx.pro new/equalx-0.7.1/equalx.pro --- old/equalx-0.7.0/equalx.pro 2014-03-26 11:16:29.000000000 +0100 +++ new/equalx-0.7.1/equalx.pro 2014-03-26 18:03:41.000000000 +0100 @@ -51,8 +51,6 @@ src \ ui -isEmpty( PREFIX ):PREFIX = /usr/bin -target.path = $$PREFIX INSTALLS += target DISTFILES += resources/templates/* \ resources/icons/menu/* \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/include/defines.h new/equalx-0.7.1/include/defines.h --- old/equalx-0.7.0/include/defines.h 2014-03-26 11:16:29.000000000 +0100 +++ new/equalx-0.7.1/include/defines.h 2014-03-26 18:14:15.000000000 +0100 @@ -22,7 +22,7 @@ #define APP_FULL_NAME "EqualX - The LaTeX Equation Editor" #define APP_NAME "EqualX" -#define APP_VERSION "0.7.0" +#define APP_VERSION "0.7.1" #define APP_SITE "http://equalx.sourceforge.net/" #define AUTHOR_NAME "Mihai Niculescu" #define AUTHOR_EMAIL "q.quark(a)gmail.com" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/resources/equalx.desktop new/equalx-0.7.1/resources/equalx.desktop --- old/equalx-0.7.0/resources/equalx.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/equalx-0.7.1/resources/equalx.desktop 2014-03-26 18:03:41.000000000 +0100 @@ -0,0 +1,18 @@ +[Desktop Entry] +Version=0.7.0 +Exec=equalx +Terminal=false +Type=Application +StartupNotify=false +MimeType=image/png;image/svg+xml;image/jpg; +Icon=equalx-64x64.png +Categories=Qt;KDE;Office;Math; +X-DBUS-StartupType=Unique +Name=EqualX +Name[ro]=EgalX +GenericName=LaTeX Equation Editor +GenericName[ro]=Editor LaTeX de ecuații +Comment=Create equations in LaTeX +Comment[ro]=Creează ecuații folosind LaTeX + + Files old/equalx-0.7.0/resources/icons/equalx/equalx-16x16.png and new/equalx-0.7.1/resources/icons/equalx/equalx-16x16.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/src/HistoryPanel/HistoryListModel.cpp new/equalx-0.7.1/src/HistoryPanel/HistoryListModel.cpp --- old/equalx-0.7.0/src/HistoryPanel/HistoryListModel.cpp 2014-03-26 11:16:29.000000000 +0100 +++ new/equalx-0.7.1/src/HistoryPanel/HistoryListModel.cpp 2014-03-26 18:03:41.000000000 +0100 @@ -99,10 +99,11 @@ void HistoryListModel::onHistoryChanged() { + beginResetModel(); mHistorySize = mLibrary->historySize(); if(mHistorySize==0) mChildren = 0; - QAbstractListModel::resetInternalData(); + endResetModel(); } ++++++ equalx-fix-desktop-file.patch ++++++ Index: equalx-0.7.1/resources/equalx.desktop =================================================================== --- equalx-0.7.1.orig/resources/equalx.desktop +++ equalx-0.7.1/resources/equalx.desktop @@ -1,12 +1,11 @@ [Desktop Entry] -Version=0.7.0 Exec=equalx Terminal=false Type=Application StartupNotify=false MimeType=image/png;image/svg+xml;image/jpg; -Icon=equalx-64x64.png -Categories=Qt;KDE;Office;Math; +Icon=equalx +Categories=Qt;KDE;Office;WordProcessor; X-DBUS-StartupType=Unique Name=EqualX Name[ro]=EgalX -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-dns-server for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '14

30 Mar '14

Hello community, here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2014-03-30 07:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-dns-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2014-03-26 16:42:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2014-03-30 12:31:28.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 28 15:04:54 UTC 2014 - vmoravec(a)suse.com + +- Fix failing testsuite +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-3.1.5.tar.bz2 New: ---- yast2-dns-server-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.HBmvpc/_old 2014-03-30 12:31:30.000000000 +0200 +++ /var/tmp/diff_new_pack.HBmvpc/_new 2014-03-30 12:31:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 Url: https://github.com/yast/yast-dns-server ++++++ yast2-dns-server-3.1.5.tar.bz2 -> yast2-dns-server-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.5/package/yast2-dns-server.changes new/yast2-dns-server-3.1.6/package/yast2-dns-server.changes --- old/yast2-dns-server-3.1.5/package/yast2-dns-server.changes 2014-03-26 11:12:04.000000000 +0100 +++ new/yast2-dns-server-3.1.6/package/yast2-dns-server.changes 2014-03-28 17:27:20.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 28 15:04:54 UTC 2014 - vmoravec(a)suse.com + +- Fix failing testsuite +- 3.1.6 + +------------------------------------------------------------------- Wed Mar 12 16:26:57 CET 2014 - locilka(a)suse.com - Fixed splitting/joining longer TXT and SPF records (bnc#867596) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.5/package/yast2-dns-server.spec new/yast2-dns-server-3.1.6/package/yast2-dns-server.spec --- old/yast2-dns-server-3.1.5/package/yast2-dns-server.spec 2014-03-26 11:12:05.000000000 +0100 +++ new/yast2-dns-server-3.1.6/package/yast2-dns-server.spec 2014-03-28 17:27:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 Url: https://github.com/yast/yast-dns-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.5/testsuite/tests/Write.out new/yast2-dns-server-3.1.6/testsuite/tests/Write.out --- old/yast2-dns-server-3.1.5/testsuite/tests/Write.out 2014-03-26 11:12:05.000000000 +0100 +++ new/yast2-dns-server-3.1.6/testsuite/tests/Write.out 2014-03-28 17:27:20.000000000 +0100 @@ -2,8 +2,8 @@ Return true Dump ======================= Write .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[] true -Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":0, "stdout":"20030806"] -Execute .target.bash_output "mv --force /etc/named.conf /etc/named.conf.yast2-save" $["exit":0, "stdout":"20030806"] +Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":0, "stderr":"", "stdout":"20030806"] +Execute .target.bash_output "mv --force /etc/named.conf /etc/named.conf.yast2-save" $["exit":0, "stderr":"", "stdout":"20030806"] Execute .target.bash "touch /etc/named.conf" 0 Write .dns.named.value.acl [] true Dir .dns.named.section: ["options", "zone \"localhost\" in"] @@ -31,14 +31,14 @@ Write .sysconfig.named nil true Write .dns.named.value."zone \"example.com\" in".type ["master"] true Dir .dns.named.value."zone \"example.com\" in": [] -Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stdout":"20030806"] +Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"", "stdout":"20030806"] Write .dns.zone ["/var/lib/named/example.com", $["TTL":"1W", "records":[$["key":"localhost", "type":"A", "value":"127.0.0.1"], $["key":"localhost", "type":"NS", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":"42", "server":"@", "zone":"@"]]] true Write .dns.named.value."zone \"example.com\" in".file ["\"example.com\""] true Write .dns.named.value."zone \"example.com\" in".type ["master"] true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "bind" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":0, "stdout":"20030806"] +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":0, "stderr":"", "stdout":"20030806"] Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":0, "stdout":"20030806"] +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":0, "stderr":"", "stdout":"20030806"] Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.5/testsuite/tests/Write.rb new/yast2-dns-server-3.1.6/testsuite/tests/Write.rb --- old/yast2-dns-server-3.1.5/testsuite/tests/Write.rb 2014-03-26 11:12:06.000000000 +0100 +++ new/yast2-dns-server-3.1.6/testsuite/tests/Write.rb 2014-03-28 17:27:20.000000000 +0100 @@ -255,7 +255,7 @@ } @WRITE = {} @EXEC = { - "target" => { "bash_output" => { "exit" => 0, "stdout" => "20030806" } } + "target" => { "bash_output" => { "exit" => 0, "stdout" => "20030806", "stderr"=>"" } } } DUMP("=======================") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.5/testsuite/tests/YaPIStartStopDnsService.out new/yast2-dns-server-3.1.6/testsuite/tests/YaPIStartStopDnsService.out --- old/yast2-dns-server-3.1.5/testsuite/tests/YaPIStartStopDnsService.out 2014-03-26 11:12:06.000000000 +0100 +++ new/yast2-dns-server-3.1.6/testsuite/tests/YaPIStartStopDnsService.out 2014-03-28 17:27:20.000000000 +0100 @@ -3,5 +3,5 @@ Dump ========================================================== Return true Dump ========================================================== -Return true +Return false Dump ========================================================== -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xine-ui for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '14

30 Mar '14

Hello community, here is the log from the commit of package xine-ui for openSUSE:Factory checked in at 2014-03-30 09:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xine-ui (Old) and /work/SRC/openSUSE:Factory/.xine-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xine-ui" Changes: -------- --- /work/SRC/openSUSE:Factory/xine-ui/xine-ui.changes 2013-03-10 09:52:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xine-ui.new/xine-ui.changes 2014-03-30 12:30:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Dec 30 11:02:00 UTC 2013 - Manfred.Tremmel(a)iiv.de + +- added missing supported mime types in desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-ui.spec ++++++ --- /var/tmp/diff_new_pack.li1Q1z/_old 2014-03-30 12:31:02.000000000 +0200 +++ /var/tmp/diff_new_pack.li1Q1z/_new 2014-03-30 12:31:02.000000000 +0200 @@ -17,6 +17,7 @@ Name: xine-ui +%bcond_without distributable BuildRequires: aalib-devel BuildRequires: autoconf BuildRequires: automake @@ -24,6 +25,9 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libxine-devel +%if !%{with distributable} +BuildRequires: libxine2-codecs +%endif BuildRequires: lirc-devel BuildRequires: readline-devel BuildRequires: update-desktop-files -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0