February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit python-amqp for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package python-amqp for openSUSE:Factory checked in at 2015-02-18 11:39:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-amqp (Old) and /work/SRC/openSUSE:Factory/.python-amqp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-amqp" Changes: -------- --- /work/SRC/openSUSE:Factory/python-amqp/python-amqp.changes 2014-09-17 17:25:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-amqp.new/python-amqp.changes 2015-02-18 12:08:53.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 16:15:42 UTC 2015 - dmueller(a)suse.com + +- replace set_socket_TCP_KEEPALIVE_and_TCP_USER_TIMEOUT.patch + with tune-keepalive-intervals.diff (bnc#902207) + +------------------------------------------------------------------- New: ---- tune-keepalive-intervals.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-amqp.spec ++++++ --- /var/tmp/diff_new_pack.6RuUkX/_old 2015-02-18 12:08:54.000000000 +0100 +++ /var/tmp/diff_new_pack.6RuUkX/_new 2015-02-18 12:08:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-amqp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Source: https://pypi.python.org/packages/source/a/amqp/amqp-%{version}.tar.gz # PATCH-FIX-OPENSUSE speilicke(a)suse.com -- Avoid excessive doc dependencies Patch0: amqp-drop-sphinxcontrib-issuetracker-dependency.patch +Patch1: tune-keepalive-intervals.diff BuildRequires: python-devel BuildRequires: python-setuptools # Documentation requirements: @@ -49,6 +50,7 @@ %prep %setup -q -n amqp-%{version} %patch0 -p1 +%patch1 -p0 %build python setup.py build ++++++ tune-keepalive-intervals.diff ++++++ --- amqp/transport.py +++ amqp/transport.py @@ -98,6 +98,12 @@ self.sock.settimeout(None) self.sock.setsockopt(SOL_TCP, socket.TCP_NODELAY, 1) self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) + # If connection is idle for more than KEEPIDLE seconds + # Start sending a probe every KEEPINTVL seconds + # for KEEPCNT times. If none respond, about the connection + self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, 60) + self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, 10) + self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, 9) self._setup_transport() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-chardet for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package python-chardet for openSUSE:Factory checked in at 2015-02-18 11:39:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-chardet (Old) and /work/SRC/openSUSE:Factory/.python-chardet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-chardet" Changes: -------- --- /work/SRC/openSUSE:Factory/python-chardet/python-chardet.changes 2013-10-25 11:18:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-chardet.new/python-chardet.changes 2015-02-18 12:08:52.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 10 23:45:01 UTC 2015 - aloisio(a)gmx.com + +- Update to version 2.3.0 + * Added support for CP932 detection (thanks to @hashy) + * Fixed an issue where UTF-8 with a BOM would not be detected + as UTF-8-SIG (#8) + * Modified chardetect to use argparse for argument parsing + * Moved docs to a gh-pages branch. You can now access them + at http://chardet.github.io +- Changelog on https://github.com/chardet/chardet/commits/2.3.0 +- Other minor changes + +------------------------------------------------------------------- Old: ---- chardet-2.1.1.tar.bz2 New: ---- chardet-2.3.0.tar.bz2 python-chardet-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-chardet.spec ++++++ --- /var/tmp/diff_new_pack.XRmpe1/_old 2015-02-18 12:08:53.000000000 +0100 +++ /var/tmp/diff_new_pack.XRmpe1/_new 2015-02-18 12:08:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-chardet # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,20 +17,18 @@ Name: python-chardet -Version: 2.1.1 +Version: 2.3.0 Release: 0 Summary: Universal encoding detector License: LGPL-2.1+ Group: Development/Languages/Python -Url: http://chardet.feedparser.org/ -Source: chardet-%{version}.tar.bz2 +Url: https://github.com/chardet/chardet +Source0: chardet-%{version}.tar.bz2 +Source1: python-chardet-rpmlintrc BuildRequires: python-devel BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%else +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif @@ -75,6 +73,6 @@ %files %defattr(-,root,root,-) %{python_sitelib}/* -%{_bindir}/chardetect.py +%{_bindir}/chardetect %changelog ++++++ chardet-2.1.1.tar.bz2 -> chardet-2.3.0.tar.bz2 ++++++ ++++ 6827 lines of diff (skipped) ++++++ python-chardet-rpmlintrc ++++++ # remove warnings about modules not being executable addFilter("non-executable-script") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-parallax for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package python-parallax for openSUSE:Factory checked in at 2015-02-18 11:39:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-parallax (Old) and /work/SRC/openSUSE:Factory/.python-parallax.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-parallax" Changes: -------- --- /work/SRC/openSUSE:Factory/python-parallax/python-parallax.changes 2015-01-08 23:01:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-parallax.new/python-parallax.changes 2015-02-18 12:08:52.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 12 16:47:44 UTC 2015 - kgronlund(a)suse.com + +- Release 1.0.0a3 + - Be more accepting with format of limit argument + - Fix incorrect name of options attribute + +------------------------------------------------------------------- Old: ---- parallax-1.0.0a2.tar.gz New: ---- parallax-1.0.0a3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-parallax.spec ++++++ --- /var/tmp/diff_new_pack.OXwkPQ/_old 2015-02-18 12:08:52.000000000 +0100 +++ /var/tmp/diff_new_pack.OXwkPQ/_new 2015-02-18 12:08:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-parallax # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: python-parallax -Version: 1.0.0a2 +Version: 1.0.0a3 Release: 0 -License: BSD-3-Clause Summary: Execute commands and copy files over SSH to multiple machines at once -Url: https://github.com/krig/parallax/ +License: BSD-3-Clause Group: Development/Languages/Python +Url: https://github.com/krig/parallax/ Source: https://pypi.python.org/packages/source/p/parallax/parallax-%{version}.tar.… BuildRequires: python-devel BuildRequires: python-setuptools ++++++ parallax-1.0.0a2.tar.gz -> parallax-1.0.0a3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.0a2/AUTHORS new/parallax-1.0.0a3/AUTHORS --- old/parallax-1.0.0a2/AUTHORS 2014-10-15 15:40:04.000000000 +0200 +++ new/parallax-1.0.0a3/AUTHORS 2015-02-12 17:42:26.000000000 +0100 @@ -1,3 +1,4 @@ Andrew McNabb <amcnabb at mcnabbs.org> Brent Chun <bnc at theether.org> -Kristoffer Gronlund <krig at koru.se> \ No newline at end of file +Kristoffer Gronlund <krig at koru.se> +Vladislav Bogdanov <bubble(a)hoster-ok.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.0a2/PKG-INFO new/parallax-1.0.0a3/PKG-INFO --- old/parallax-1.0.0a2/PKG-INFO 2014-12-25 18:25:00.000000000 +0100 +++ new/parallax-1.0.0a3/PKG-INFO 2015-02-12 17:45:29.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: parallax -Version: 1.0.0a2 +Version: 1.0.0a3 Summary: Execute commands and copy files over SSH to multiple machines at once Home-page: https://github.com/krig/parallax/ Author: Kristoffer Gronlund diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.0a2/README.md new/parallax-1.0.0a3/README.md --- old/parallax-1.0.0a2/README.md 2014-10-15 17:30:41.000000000 +0200 +++ new/parallax-1.0.0a3/README.md 2014-12-25 18:53:06.000000000 +0100 @@ -73,4 +73,4 @@ [pssh]: https://code.google.com/p/parallel-ssh/ "parallel-ssh" [ez]: http://peak.telecommunity.com/dist/ez_setup.py "ez_setup.py" - [obs]: https://build.opensuse.org/package/show/home:KGronlund/python-parallax "OBS:python-parallax" + [obs]: https://build.opensuse.org/package/show/devel:languages:python/python-paral… "OBS:python-parallax" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.0a2/parallax/manager.py new/parallax-1.0.0a3/parallax/manager.py --- old/parallax-1.0.0a2/parallax/manager.py 2014-12-16 20:37:45.000000000 +0100 +++ new/parallax-1.0.0a3/parallax/manager.py 2015-02-12 17:40:11.000000000 +0100 @@ -47,11 +47,28 @@ # Backwards compatibility with old __init__ # format: Only argument is an options dict if not isinstance(limit, int): - self.limit = limit.par - self.timeout = limit.timeout - self.askpass = limit.askpass - self.outdir = limit.outdir - self.errdir = limit.errdir + if hasattr(limit, 'limit'): + self.limit = limit.limit + elif hasattr(limit, 'par'): + self.limit = limit.par + else: + self.limit = DEFAULT_PARALLELISM + if hasattr(limit, 'timeout'): + self.timeout = limit.timeout + else: + self.timeout = DEFAULT_TIMEOUT + if hasattr(limit, 'askpass'): + self.askpass = limit.askpass + else: + self.askpass = False + if hasattr(limit, 'outdir'): + self.outdir = limit.outdir + else: + self.outdir = None + if hasattr(limit, 'errdir'): + self.errdir = limit.errdir + else: + self.errdir = None else: self.limit = limit self.timeout = timeout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallax-1.0.0a2/parallax/version.py new/parallax-1.0.0a3/parallax/version.py --- old/parallax-1.0.0a2/parallax/version.py 2014-12-25 18:21:48.000000000 +0100 +++ new/parallax-1.0.0a3/parallax/version.py 2015-02-12 17:42:57.000000000 +0100 @@ -1 +1 @@ -VERSION = '1.0.0a2' +VERSION = '1.0.0a3' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit couchdb for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package couchdb for openSUSE:Factory checked in at 2015-02-18 11:39:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/couchdb (Old) and /work/SRC/openSUSE:Factory/.couchdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "couchdb" Changes: -------- --- /work/SRC/openSUSE:Factory/couchdb/couchdb.changes 2015-02-16 21:14:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.couchdb.new/couchdb.changes 2015-02-18 12:08:50.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 17 08:41:45 UTC 2015 - dimstar(a)opensuse.org + +- Add makeinfo BuildRequires: required to create the .info files. +- Fix install-info calls to reference the right file. Move the + install-info-delete call from postun to preun (we need the file + to be present). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ couchdb.spec ++++++ --- /var/tmp/diff_new_pack.FZIa3b/_old 2015-02-18 12:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.FZIa3b/_new 2015-02-18 12:08:51.000000000 +0100 @@ -53,6 +53,7 @@ BuildRequires: help2man BuildRequires: libicu-devel BuildRequires: libtool +BuildRequires: makeinfo %if 0%{?suse_version} < 1200 BuildRequires: mozilla-xulrunner192-devel %else @@ -147,7 +148,7 @@ %else %{fillup_and_insserv %{name}} %endif -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/CouchDB.gz %postun %if 0%{?suse_version} >= 1230 @@ -157,9 +158,8 @@ %insserv_cleanup %endif -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz - %preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/CouchDB.gz %if 0%{?suse_version} >= 1230 %service_del_preun %{name}.service %else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-posix_ipc for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package python-posix_ipc for openSUSE:Factory checked in at 2015-02-18 11:39:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-posix_ipc (Old) and /work/SRC/openSUSE:Factory/.python-posix_ipc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-posix_ipc" Changes: -------- --- /work/SRC/openSUSE:Factory/python-posix_ipc/python-posix_ipc.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-posix_ipc.new/python-posix_ipc.changes 2015-02-18 12:08:51.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 17 07:14:05 UTC 2015 - tbechtold(a)suse.com + +- update to 0.9.9: + * Added the ability to build on platforms that don't support the + POSIX Realtime Signals Extension. + * Added extensive unit tests. + * Minor documentation updates. + +------------------------------------------------------------------- Old: ---- posix_ipc-0.9.8.tar.gz New: ---- posix_ipc-0.9.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-posix_ipc.spec ++++++ --- /var/tmp/diff_new_pack.bwqiQ4/_old 2015-02-18 12:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.bwqiQ4/_new 2015-02-18 12:08:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-posix_ipc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-posix_ipc -Version: 0.9.8 +Version: 0.9.9 Release: 0 Summary: POSIX IPC primitives for Python License: BSD-3-Clause ++++++ posix_ipc-0.9.8.tar.gz -> posix_ipc-0.9.9.tar.gz ++++++ ++++ 5051 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 cmocka for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package cmocka for openSUSE:Factory checked in at 2015-02-18 11:39:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmocka (Old) and /work/SRC/openSUSE:Factory/.cmocka.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmocka" Changes: -------- --- /work/SRC/openSUSE:Factory/cmocka/cmocka.changes 2014-09-12 10:04:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmocka.new/cmocka.changes 2015-02-18 12:08:49.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Feb 17 08:13:09 UTC 2015 - asn(a)cryptomilk.org + +- Add missing requires for cmake and pkg-config + +------------------------------------------------------------------- +Tue Feb 17 08:10:18 UTC 2015 - asn(a)cryptomilk.org + +- Turn on unit tests + +------------------------------------------------------------------- +Mon Feb 16 18:14:15 UTC 2015 - asn(a)cryptomilk.org + +- Update to version 1.0.0 + * Added new test runner with group fixtures. The old runner is deprecated + * Added an extensible message output formatter + * Added jUnit XML message output + * Added subunit message output + * Added Test Anything Protocol message output + * Added skip() command + * Added test_realloc() + * Added a cmockery compat header + * Fixed a lot of bugs on Windows + +------------------------------------------------------------------- Old: ---- cmocka-0.4.1.tar.xz New: ---- cmocka-1.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmocka.spec ++++++ --- /var/tmp/diff_new_pack.sgxtED/_old 2015-02-18 12:08:49.000000000 +0100 +++ /var/tmp/diff_new_pack.sgxtED/_new 2015-02-18 12:08:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cmocka # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -21,7 +21,7 @@ BuildRequires: pkg-config Name: cmocka -Version: 0.4.1 +Version: 1.0.0 Release: 0 # Summary: Lightweight library to simplify and generalize unit tests for C @@ -34,57 +34,54 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -There are a variety of C unit testing frameworks available however many of them -are fairly complex and require the latest compiler technology. Some development -requires the use of old compilers which makes it difficult to use some unit -testing frameworks. In addition many unit testing frameworks assume the code -being tested is an application or module that is targeted to the same platform -that will ultimately execute the test. Because of this assumption many -frameworks require the inclusion of standard C library headers in the code -module being tested which may collide with the custom or incomplete -implementation of the C library utilized by the code under test. - -Cmocka only requires a test application is linked with the standard C library -which minimizes conflicts with standard C library headers. Also, CMocka tries -to avoid the use of some of the newer features of C compilers. - -This results in CMocka being a relatively small library that can be used to -test a variety of exotic code. If a developer wishes to simply test an -application with the latest compiler then other unit testing frameworks may be -preferable. +cmocka is an elegant unit testing framework for C with support for mock +objects. It only requires the standard C library, works on a range of computing +platforms (including embedded) and with different compilers. + +Features: + * Support for mock objects + * Only requires the C library + * Several supported output formats (Subunit, TAP, jUnit XML) + * Fully documented API + * Test fixtures + * Exception handling for signals (SIGSEGV, SIGILL, ...) + * No fork() used + * Very well tested + * Testing of memory leaks, buffer overflows and underflows. -This is the successor of Google's Cmockery. +Also, CMocka tries to avoid the use of some of the newer features of C +compilers. %package -n libcmocka0 Summary: Lightweight library to simplify and generalize unit tests for C Group: System/Libraries %description -n libcmocka0 -There are a variety of C unit testing frameworks available however many of them -are fairly complex and require the latest compiler technology. Some development -requires the use of old compilers which makes it difficult to use some unit -testing frameworks. In addition many unit testing frameworks assume the code -being tested is an application or module that is targeted to the same platform -that will ultimately execute the test. Because of this assumption many -frameworks require the inclusion of standard C library headers in the code -module being tested which may collide with the custom or incomplete -implementation of the C library utilized by the code under test. - -CMocka only requires a test application is linked with the standard C library -which minimizes conflicts with standard C library headers. Also, CMocka tries -to avoid the use of some of the newer features of C compilers. - -This results in CMocka being a relatively small library that can be used to -test a variety of exotic code. If a developer wishes to simply test an -application with the latest compiler then other unit testing frameworks may be -preferable. +cmocka is an elegant unit testing framework for C with support for mock +objects. It only requires the standard C library, works on a range of computing +platforms (including embedded) and with different compilers. + +Features: + * Support for mock objects + * Only requires the C library + * Several supported output formats (Subunit, TAP, jUnit XML) + * Fully documented API + * Test fixtures + * Exception handling for signals (SIGSEGV, SIGILL, ...) + * No fork() used + * Very well tested + * Testing of memory leaks, buffer overflows and underflows. + +Also, CMocka tries to avoid the use of some of the newer features of C +compilers. -This is the successor of Google's Cmockery. %package -n libcmocka-devel Summary: Development headers for the cmocka library Group: Development/Libraries/C and C++ +Requires: cmake Requires: libcmocka0 = %{version} +Requires: pkg-config %description -n libcmocka-devel Development headers for the cmocka unit testing library. @@ -108,15 +105,15 @@ cmake \ -DCMAKE_C_FLAGS:STRING="%{optflags}" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_STATIC_LIB=ON \ %if %{_lib} == lib64 -DLIB_SUFFIX=64 \ %endif + -DUNIT_TESTING=ON \ %{_builddir}/%{name}-%{version} -make %{?_smp_mflags} VERBOSE=1 +%__make %{?_smp_mflags} VERBOSE=1 popd obj %install @@ -124,6 +121,11 @@ %makeinstall popd +%check +pushd obj +%__make test || cat Testing/Temporary/LastTest.log +popd + %post -n libcmocka0 /sbin/ldconfig @@ -141,6 +143,7 @@ %files -n libcmocka-devel %defattr(-,root,root) %{_includedir}/cmocka.h +%{_includedir}/cmocka_pbc.h %{_libdir}/libcmocka.so %{_libdir}/pkgconfig/cmocka.pc %dir %{_libdir}/cmake/cmocka ++++++ cmocka-0.4.1.tar.xz -> cmocka-1.0.0.tar.xz ++++++ ++++ 28164 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 deepin-utils for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package deepin-utils for openSUSE:Factory checked in at 2015-02-18 11:39:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-utils (Old) and /work/SRC/openSUSE:Factory/.deepin-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-utils/deepin-utils.changes 2014-05-27 12:00:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-utils.new/deepin-utils.changes 2015-02-18 12:08:48.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 4 12:59:03 UTC 2014 - hillwood(a)linuxfans.org + +- Update to git20140703. + Bug fix. + +------------------------------------------------------------------- Old: ---- deepin-utils_0.0.2-20140509135706~8aaf2a6f00.tar.gz New: ---- deepin-utils_0.0.2+20140703165416~8aaf2a6f00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-utils.spec ++++++ --- /var/tmp/diff_new_pack.MH1F99/_old 2015-02-18 12:08:49.000000000 +0100 +++ /var/tmp/diff_new_pack.MH1F99/_new 2015-02-18 12:08:49.000000000 +0100 @@ -21,10 +21,10 @@ Summary: Utils library for all project in Linux Deepin License: GPL-3.0+ Group: System/GUI/GNOME -Version: 0.0.2git20140509 +Version: 0.0.2git20140703 Release: 0 Url: https://github.com/linuxdeepin/deepin-utils -Source0: http://packages.linuxdeepin.com/deepin/pool/main/d/%{name}/%{name}_0.0.2-20… +Source0: http://packages.linuxdeepin.com/deepin/pool/main/d/%{name}/%{name}_0.0.2+20… BuildRequires: libsoup-devel BuildRequires: libwebkitgtk-devel BuildRequires: python-devel @@ -48,7 +48,7 @@ Base code move from utils module of deepin-ui. %prep -%setup -q -n %{name}-0.0.2 +%setup -q -n %{name}-0.0.2+20140703165416~8aaf2a6f00 %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deepin-ui for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package deepin-ui for openSUSE:Factory checked in at 2015-02-18 11:39:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-ui (Old) and /work/SRC/openSUSE:Factory/.deepin-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-ui" Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-ui/deepin-ui.changes 2014-05-27 11:59:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-ui.new/deepin-ui.changes 2015-02-18 12:08:46.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 17 07:30:21 UTC 2015 - hillwood(a)linuxfans.org + +- Update to 2.0git20141229 + * Update installation script + * Feature update +- Drop deepin-ui-demo, upstream drop it. + * remove deepin-uidemo.desktop and distributor-logo.png + +------------------------------------------------------------------- Old: ---- deepin-ui-demo.desktop deepin-ui_1.1-20140507164634~df466b0600.tar.gz distributor-logo.png New: ---- deepin-ui_1.1+20141229194712~5a86faec50.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-ui.spec ++++++ --- /var/tmp/diff_new_pack.yNGcy4/_old 2015-02-18 12:08:47.000000000 +0100 +++ /var/tmp/diff_new_pack.yNGcy4/_new 2015-02-18 12:08:47.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package deepin-ui # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2013 Hillwood Yang <hillwood(a)linuxfans.org> +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 Hillwood Yang <hillwood(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,10 @@ Summary: UI toolkit for Linux Deepin License: GPL-3.0+ Group: System/GUI/GNOME -Version: 2.0git20140507 +Version: 2.0git20141229 Release: 0 Url: http://www.linuxdeepin.com -Source0: %{name}_1.1-20140507164634~df466b0600.tar.gz -Source1: %{name}-demo.desktop -Source2: distributor-logo.png +Source0: %{name}_1.1+20141229194712~5a86faec50.tar.gz BuildRequires: cairo-devel BuildRequires: fdupes BuildRequires: gcc @@ -41,6 +39,7 @@ Requires: deepin-utils Requires: python-cssselect Requires: python-webkitgtk +Obsoletes: %{name}-demo < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %{py_requires} @@ -48,20 +47,9 @@ %description UI toolkit libs for Linux Deepin,Awesome and Beautiful UI libs with LinuxDeepin. -%package demo -Summary: UI toolkit for Linux Deepin -Group: System/GUI/Other -Requires: %{name} = %{version} -Recommends: %{name}-lang = %{version} - -%description demo -UI toolkit libs demos for Linux Deepin,Awesome and Beautiful UI libs with LinuxDeepin. - - -%lang_package %prep -%setup -q -n %{name}-1.1 +%setup -q -n %{name}-1.1+20141229194712~5a86faec50 %build @@ -71,64 +59,17 @@ export CFLAGS="$RPM_OPT_FLAGS" python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT -# deepin-ui files install -mkdir -p %{buildroot}/%{_datadir}/pyshared -mv %{buildroot}/%{_prefix}/dtk %{buildroot}/%{_datadir}/pyshared -rm -rf %{buildroot}/%{_datadir}/pyshared/dtk/locale/*.po -rm -rf %{buildroot}/%{_datadir}/pyshared/dtk/locale/deepin-ui.pot -mv %{buildroot}/%{_datadir}/pyshared/dtk/locale %{buildroot}/%{_datadir}/locale -cd %{buildroot}/%{_prefix}/lib/python2.7/site-packages/dtk -ln -s ../../../../share/pyshared/dtk/theme theme -cd %{_builddir}/%{buildsubdir} - -# deepin-ui-demo files install -mkdir %{buildroot}/%{_datadir}/applications -mkdir %{buildroot}/%{_datadir}/deepin-ui-demo -mkdir %{buildroot}/%{_bindir}/ -mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps -cp icon.ico %{buildroot}/%{_datadir}/deepin-ui-demo -cp frame.png %{buildroot}/%{_datadir}/deepin-ui-demo -cp logo.png %{buildroot}/%{_datadir}/deepin-ui-demo -cp %{S:1} %{buildroot}/%{_datadir}/applications -cp -R app_theme %{buildroot}/%{_datadir}/deepin-ui-demo -cp -R skin %{buildroot}/%{_datadir}/deepin-ui-demo -cp -R cover %{buildroot}/%{_datadir}/deepin-ui-demo -cp -R demo.py %{buildroot}/%{_datadir}/deepin-ui-demo -cp %{S:2} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps -cd %{buildroot}%{_bindir} -ln -s ../share/deepin-ui-demo/demo.py %{name}-demo -cd %{_builddir}/%{buildsubdir} - -# fix permission -chmod 0644 %{buildroot}%{_datadir}/pyshared/dtk/theme/*/theme.txt -chmod 0644 %{buildroot}%{_datadir}/deepin-ui-demo/app_theme/*/theme.txt -chmod 0755 %{buildroot}%{python_sitelib}/dtk/ui/*.py - %fdupes %{buildroot} -%find_lang %{name} -%suse_update_desktop_file %{name}-demo - -%post demo -%icon_theme_cache_post - -%posttrans demo -%icon_theme_cache_post %files %defattr(-,root,root) %doc AUTHORS COPYING -%{_datadir}/pyshared +# %{_datadir}/pyshared %{python_sitelib}/dtk -%{python_sitelib}/dtk-0.1-py2.7.egg-info -# %{_prefix}/lib/python2.7/site-packages/dtk_*.so - -%files demo -%defattr(-,root,root) -%{_bindir}/%{name}-demo -%{_datadir}/%{name}-demo -%{_datadir}/applications/%{name}-demo.desktop -%{_datadir}/icons/hicolor/48x48/apps/distributor-logo.png - -%files lang -f %{name}.lang +%dir %{python_sitelib}/dtk-1.0.3-py2.7.egg-info +%{python_sitelib}/dtk-1.0.3-py2.7.egg-info/PKG-INFO +%{python_sitelib}/dtk-1.0.3-py2.7.egg-info/SOURCES.txt +%{python_sitelib}/dtk-1.0.3-py2.7.egg-info/dependency_links.txt +%{python_sitelib}/dtk-1.0.3-py2.7.egg-info/top_level.txt %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-mysql2 for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package rubygem-mysql2 for openSUSE:Factory checked in at 2015-02-18 11:39:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-mysql2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-mysql2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-mysql2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-mysql2/rubygem-mysql2.changes 2015-02-10 20:22:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-mysql2.new/rubygem-mysql2.changes 2015-02-18 12:08:45.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 17 05:29:23 UTC 2015 - coolo(a)suse.com + +- updated to version 0.3.18 + +------------------------------------------------------------------- Old: ---- mysql2-0.3.17.gem New: ---- mysql2-0.3.18.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-mysql2.spec ++++++ --- /var/tmp/diff_new_pack.Nb2QPG/_old 2015-02-18 12:08:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Nb2QPG/_new 2015-02-18 12:08:45.000000000 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-mysql2 -Version: 0.3.17 +Version: 0.3.18 Release: 0 %define mod_name mysql2 %define mod_full_name %{mod_name}-%{version} @@ -52,7 +52,7 @@ %install %gem_install \ - --doc-files="MIT-LICENSE README.md" \ + --doc-files="README.md" \ -f %gem_cleanup ++++++ mysql2-0.3.17.gem -> mysql2-0.3.18.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MIT-LICENSE new/MIT-LICENSE --- old/MIT-LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/MIT-LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -Copyright (c) 2010-2011 Brian Lopez - http://github.com/brianmario - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,7 @@ # Mysql2 - A modern, simple and very fast MySQL library for Ruby - binding to libmysql -[![Build Status](https://travis-ci.org/brianmario/mysql2.png)](https://travis-ci.org… +Travis CI [![Travis CI Status](https://travis-ci.org/brianmario/mysql2.png)](https://travis-ci.org… +Appveyor CI [![Appveyor CI Status](https://ci.appveyor.com/api/projects/status/github/sodabrew/mysql2)… The Mysql2 gem is meant to serve the extremely common use-case of connecting, querying and iterating on results. Some database libraries out there serve as direct 1:1 mappings of the already complex C APIs available. @@ -15,12 +16,16 @@ `Mysql2::Result` - returned from issuing a #query on the connection. It includes Enumerable. ## Installing -### OSX / Linux +### General Instructions ``` sh gem install mysql2 ``` -This gem links against MySQL's `libmysqlclient` C shared library. You may need to install a package such as `libmysqlclient-dev`, `mysql-devel`, or other appropriate package for your system. +This gem links against MySQL's `libmysqlclient` library or `Connector/C` +library, and compatible alternatives such as MariaDB. +You may need to install a package such as `libmysqlclient-dev`, `mysql-devel`, +or other appropriate package for your system. See below for system-specific +instructions. By default, the mysql2 gem will try to find a copy of MySQL in this order: @@ -51,25 +56,35 @@ are located somewhere different than on your build system. This overrides any rpath calculated by default or by the options above. -### Windows -First, make sure you have the DevKit installed (http://rubyinstaller.org/downloads/) and its variables -are loaded by running devkit\devktvars.bat . - -Next, you need a MySQL library to link against. If you have MySQL loaded on your development machine, -you can use that. If not, you will need to either copy the MySQL directory from your server, or else -obtain a copy of the MySQL C connector: http://dev.mysql.com/downloads/connector/c/ +### Linux and other Unixes -If you're using the connector, I recommend just getting the .zip file and unzipping it someplace convenient. +You may need to install a package such as `libmysqlclient-dev` or `mysql-devel`; +refer to your distribution's package guide to find the particular package. +The most common issue we see is a user who has the library file `libmysqlclient.so` but is +missing the header file `mysql.h` -- double check that you have the _-dev_ packages installed. + +### Mac OS X + +You may use MacPorts, Homebrew, or a native MySQL installer package. The most +common paths will be automatically searched. If you want to select a specific +MySQL directory, use the `--with-mysql-dir` or `--with-mysql-config` options above. -Now you can install mysql2. You must use the `--with-mysql-dir` option to tell gem where your MySQL library -files are. For example, if you unzipped the connector to c:\mysql-connector-c-6.1.1-win32 you would install -the gem like this: - - gem install mysql2 -- --with-mysql-dir=c:\mysql-connector-c-6.1.1-win32 +### Windows +Make sure that you have Ruby and the DevKit compilers installed. We recommend +the [Ruby Installer](http://rubyinstaller.org) distribution. -Finally, you must copy libmysql.dll from the lib subdirectory of your MySQL or MySQL connector directory into -your ruby\bin directory. In the above example, libmysql.dll would be located at -c:\mysql-connector-c-6.1.1-win32\lib . +By default, the mysql2 gem will download and use MySQL Connector/C from +mysql.com. If you prefer to use a local installation of Connector/C, add the +flag `--with-mysql-dir=c:/mysql-connector-c-x-y-z` (_this path may use forward slashes_). + +By default, the `libmysql.dll` library will be copied into the mysql2 gem +directory. To prevent this, add the flag `--no-vendor-libmysql`. The mysql2 gem +will search for `libmysql.dll` in the following paths, in order: + +* Environment variable `RUBY_MYSQL2_LIBMYSQL_DLL=C:\path\to\libmysql.dll` + (_note the Windows-style backslashes_). +* In the mysql2 gem's own directory `vendor/libmysql.dll` +* In the system's default library search paths. ## Usage @@ -422,13 +437,13 @@ This gem is tested with the following Ruby versions on Linux and Mac OS X: - * Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.x (ongoing patch releases) + * Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.x, 2.2.x (ongoing patch releases) * Ruby Enterprise Edition (based on MRI 1.8.7) * Rubinius 2.x This gem is tested with the following MySQL and MariaDB versions: - * MySQL 5.0, 5.1, 5.5, 5.6 + * MySQL 5.0, 5.1, 5.5, 5.6, 5.7 * MySQL Connector/C 6.0 and 6.1 (primarily on Windows) * MariaDB 5.5, 10.0 Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/mysql2/client.c new/ext/mysql2/client.c --- old/ext/mysql2/client.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ext/mysql2/client.c 1970-01-01 01:00:00.000000000 +0100 @@ -438,7 +438,7 @@ MYSQL_RES *result; wrapper = (mysql_client_wrapper *)ptr; - if(use_result) { + if (use_result) { result = mysql_use_result(wrapper->client); } else { result = mysql_store_result(wrapper->client); @@ -483,7 +483,7 @@ } is_streaming = rb_hash_aref(rb_iv_get(self, "@current_query_options"), sym_stream); - if(is_streaming == Qtrue) { + if (is_streaming == Qtrue) { result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_use_result, wrapper, RUBY_UBF_IO, 0); } else { result = (MYSQL_RES *)rb_thread_call_without_gvl(nogvl_store_result, wrapper, RUBY_UBF_IO, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/mysql2/extconf.rb new/ext/mysql2/extconf.rb --- old/ext/mysql2/extconf.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/ext/mysql2/extconf.rb 1970-01-01 01:00:00.000000000 +0100 @@ -20,13 +20,13 @@ /opt /opt/local /opt/local/mysql - /opt/local/lib/mysql5 + /opt/local/lib/mysql5* /usr /usr/mysql /usr/local /usr/local/mysql /usr/local/mysql-* - /usr/local/lib/mysql5 + /usr/local/lib/mysql5* ].map{|dir| "#{dir}/bin" } GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5}" @@ -74,10 +74,6 @@ rpath_dir = lib end -if RUBY_PLATFORM =~ /mswin|mingw/ - exit 1 unless have_library('libmysql') -end - if have_header('mysql.h') prefix = nil elsif have_header('mysql/mysql.h') @@ -98,31 +94,82 @@ $CFLAGS << gcc_flags end -case explicit_rpath = with_config('mysql-rpath') -when true - abort "-----\nOption --with-mysql-rpath must have an argument\n-----" -when false - warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----" -when String - # The user gave us a value so use it - rpath_flags = " -Wl,-rpath,#{explicit_rpath}" - warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----" - $LDFLAGS << rpath_flags +if RUBY_PLATFORM =~ /mswin|mingw/ + # Build libmysql.a interface link library + require 'rake' + + # Build libmysql.a interface link library + # Use rake to rebuild only if these files change + deffile = File.expand_path('../../../support/libmysql.def', __FILE__) + libfile = File.expand_path(File.join(rpath_dir, 'libmysql.lib')) + file 'libmysql.a' => [deffile, libfile] do |t| + when_writing 'building libmysql.a' do + # Ruby kindly shows us where dllwrap is, but that tool does more than we want. + # Maybe in the future Ruby could provide RbConfig::CONFIG['DLLTOOL'] directly. + dlltool = RbConfig::CONFIG['DLLWRAP'].gsub('dllwrap', 'dlltool') + sh dlltool, '--kill-at', + '--dllname', 'libmysql.dll', + '--output-lib', 'libmysql.a', + '--input-def', deffile, libfile + end + end + + Rake::Task['libmysql.a'].invoke + $LOCAL_LIBS << ' ' << 'libmysql.a' + + # Make sure the generated interface library works (if cross-compiling, trust without verifying) + unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ + abort "-----\nCannot find libmysql.a\n----" unless have_library('libmysql') + abort "-----\nCannot link to libmysql.a (my_init)\n----" unless have_func('my_init') + end + + # Vendor libmysql.dll + vendordir = File.expand_path('../../../vendor/', __FILE__) + directory vendordir + + vendordll = File.join(vendordir, 'libmysql.dll') + dllfile = File.expand_path(File.join(rpath_dir, 'libmysql.dll')) + file vendordll => [dllfile, vendordir] do |t| + when_writing 'copying libmysql.dll' do + cp dllfile, vendordll + end + end + + # Copy libmysql.dll to the local vendor directory by default + if arg_config('--no-vendor-libmysql') + # Fine, don't. + puts "--no-vendor-libmysql" + else # Default: arg_config('--vendor-libmysql') + # Let's do it! + Rake::Task[vendordll].invoke + end else - if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2] - rpath_flags = " -Wl,-rpath,#{libdir}" - if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags) - # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X. - warn "-----\nSetting rpath to #{libdir}\n-----" - $LDFLAGS << rpath_flags - else - if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? - # If we got here because try_link failed, warn the user - warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----" + case explicit_rpath = with_config('mysql-rpath') + when true + abort "-----\nOption --with-mysql-rpath must have an argument\n-----" + when false + warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----" + when String + # The user gave us a value so use it + rpath_flags = " -Wl,-rpath,#{explicit_rpath}" + warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----" + $LDFLAGS << rpath_flags + else + if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2] + rpath_flags = " -Wl,-rpath,#{libdir}" + if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags) + # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X. + warn "-----\nSetting rpath to #{libdir}\n-----" + $LDFLAGS << rpath_flags + else + if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? + # If we got here because try_link failed, warn the user + warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----" + end + # Make sure that LIBPATH gets set if we didn't explicitly set the rpath. + warn "-----\nSetting libpath to #{libdir}\n-----" + $LIBPATH << libdir unless $LIBPATH.include?(libdir) end - # Make sure that LIBPATH gets set if we didn't explicitly set the rpath. - warn "-----\nSetting libpath to #{libdir}\n-----" - $LIBPATH << libdir unless $LIBPATH.include?(libdir) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/mysql2/result.c new/ext/mysql2/result.c --- old/ext/mysql2/result.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ext/mysql2/result.c 1970-01-01 01:00:00.000000000 +0100 @@ -232,7 +232,7 @@ VALUE val = Qnil; enum enum_field_types type = fields[i].type; - if(!cast) { + if (!cast) { if (type == MYSQL_TYPE_NULL) { val = Qnil; } else { @@ -297,7 +297,7 @@ break; } msec = msec_char_to_uint(msec_char, sizeof(msec_char)); - val = rb_funcall(rb_cTime, db_timezone, 6, opt_time_year, opt_time_month, opt_time_month, UINT2NUM(hour), UINT2NUM(min), UINT2NUM(sec), UINT2NUM(msec)); + val = rb_funcall(rb_cTime, db_timezone, 7, opt_time_year, opt_time_month, opt_time_month, UINT2NUM(hour), UINT2NUM(min), UINT2NUM(sec), UINT2NUM(msec)); if (!NIL_P(app_timezone)) { if (app_timezone == intern_local) { val = rb_funcall(val, intern_localtime, 0); @@ -479,11 +479,11 @@ cast = 0; } - if(rb_hash_aref(opts, sym_stream) == Qtrue) { + if (rb_hash_aref(opts, sym_stream) == Qtrue) { streaming = 1; } - if(streaming && cacheRows) { + if (streaming && cacheRows) { rb_warn("cacheRows is ignored if streaming is true"); } @@ -601,7 +601,7 @@ mysql2_result_wrapper *wrapper; GetMysql2Result(self, wrapper); - if(wrapper->resultFreed) { + if (wrapper->resultFreed) { if (wrapper->streamingComplete){ return LONG2NUM(wrapper->numberOfRows); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/mysql2/em.rb new/lib/mysql2/em.rb --- old/lib/mysql2/em.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/mysql2/em.rb 1970-01-01 01:00:00.000000000 +0100 @@ -10,6 +10,7 @@ def initialize(client, deferable) @client = client @deferable = deferable + @is_watching = true end def notify_readable @@ -22,11 +23,19 @@ @deferable.succeed(result) end end + + def watching? + @is_watching + end + + def unbind + @is_watching = false + end end def close(*args) if @watch - @watch.detach + @watch.detach if @watch.watching? end super(*args) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/mysql2/version.rb new/lib/mysql2/version.rb --- old/lib/mysql2/version.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/mysql2/version.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +1,3 @@ module Mysql2 - VERSION = "0.3.17" + VERSION = "0.3.18" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/mysql2.rb new/lib/mysql2.rb --- old/lib/mysql2.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/mysql2.rb 1970-01-01 01:00:00.000000000 +0100 @@ -3,6 +3,29 @@ require 'bigdecimal' require 'rational' unless RUBY_VERSION >= '1.9.2' +# Load libmysql.dll before requiring mysql2/mysql2.so +# This gives a chance to be flexible about the load path +# Or to bomb out with a clear error message instead of a linker crash +if RUBY_PLATFORM =~ /mswin|mingw/ + dll_path = if ENV['RUBY_MYSQL2_LIBMYSQL_DLL'] + # If this environment variable is set, it overrides any other paths + # The user is advised to use backslashes not forward slashes + ENV['RUBY_MYSQL2_LIBMYSQL_DLL'].dup + elsif File.exist?(File.expand_path('../vendor/libmysql.dll', File.dirname(__FILE__))) + # Use vendor/libmysql.dll if it exists, convert slashes for Win32 LoadLibrary + File.expand_path('../vendor/libmysql.dll', File.dirname(__FILE__)).gsub('/', '\\') + else + # This will use default / system library paths + 'libmysql.dll' + end + + require 'Win32API' + LoadLibrary = Win32API.new('Kernel32', 'LoadLibrary', ['P'], 'I') + if 0 == LoadLibrary.call(dll_path) + abort "Failed to load libmysql.dll from #{dll_path}" + end +end + require 'mysql2/version' unless defined? Mysql2::VERSION require 'mysql2/error' require 'mysql2/mysql2' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 1970-01-01 01:00:00.000000000 +0100 +++ new/metadata 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +1,29 @@ --- !ruby/object:Gem::Specification name: mysql2 version: !ruby/object:Gem::Version - version: 0.3.17 + version: 0.3.18 platform: ruby authors: - Brian Lopez autorequire: bindir: bin cert_chain: [] -date: 2014-11-11 00:00:00.000000000 Z +date: 2015-02-17 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency - name: eventmachine - requirement: !ruby/object:Gem::Requirement - requirements: - - - '>=' - - !ruby/object:Gem::Version - version: '0' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - '>=' - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency name: rake-compiler requirement: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: 0.8.1 + version: 0.9.5 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: 0.8.1 + version: 0.9.5 - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement @@ -73,7 +59,6 @@ - ext/mysql2/extconf.rb extra_rdoc_files: [] files: -- MIT-LICENSE - README.md - ext/mysql2/client.c - ext/mysql2/client.h @@ -94,6 +79,7 @@ - lib/mysql2/error.rb - lib/mysql2/result.rb - lib/mysql2/version.rb +- support/libmysql.def - support/mysql_enc_to_ruby.rb - support/ruby_enc_to_mysql.rb - examples/eventmachine.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/em/em_spec.rb new/spec/em/em_spec.rb --- old/spec/em/em_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/em/em_spec.rb 1970-01-01 01:00:00.000000000 +0100 @@ -108,6 +108,27 @@ callbacks_run.should == [:errback] end end + + it "should not raise error when closing client with no query running" do + callbacks_run = [] + EM.run do + client = Mysql2::EM::Client.new DatabaseCredentials['root'] + defer = client.query("select sleep(0.025)") + defer.callback do |result| + callbacks_run << :callback + end + defer.errback do |err| + callbacks_run << :errback + end + EM.add_timer(0.1) do + callbacks_run.should == [:callback] + lambda { + client.close + }.should_not raise_error(/invalid binding to detach/) + EM.stop_event_loop + end + end + end end rescue LoadError puts "EventMachine not installed, skipping the specs that use it" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/mysql2/client_spec.rb new/spec/mysql2/client_spec.rb --- old/spec/mysql2/client_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/mysql2/client_spec.rb 1970-01-01 01:00:00.000000000 +0100 @@ -564,7 +564,7 @@ end it "should raise an exception when one of multiple statements fails" do - result = @multi_client.query("SELECT 1 as 'set_1'; SELECT * FROM invalid_table_name;SELECT 2 as 'set_2';") + result = @multi_client.query("SELECT 1 AS 'set_1'; SELECT * FROM invalid_table_name; SELECT 2 AS 'set_2';") result.first['set_1'].should be(1) lambda { @multi_client.next_result @@ -573,7 +573,7 @@ end it "returns multiple result sets" do - @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'").first.should eql({ 'set_1' => 1 }) + @multi_client.query("SELECT 1 AS 'set_1'; SELECT 2 AS 'set_2'").first.should eql({ 'set_1' => 1 }) @multi_client.next_result.should be_true @multi_client.store_result.first.should eql({ 'set_2' => 2 }) @@ -582,12 +582,12 @@ end it "does not interfere with other statements" do - @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'") + @multi_client.query("SELECT 1 AS 'set_1'; SELECT 2 AS 'set_2'") while( @multi_client.next_result ) @multi_client.store_result end - @multi_client.query( "select 3 as 'next'").first.should == { 'next' => 3 } + @multi_client.query("SELECT 3 AS 'next'").first.should == { 'next' => 3 } end it "will raise on query if there are outstanding results to read" do @@ -606,7 +606,7 @@ end it "#more_results? should work" do - @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'") + @multi_client.query("SELECT 1 AS 'set_1'; SELECT 2 AS 'set_2'") @multi_client.more_results?.should be_true @multi_client.next_result diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/mysql2/result_spec.rb new/spec/mysql2/result_spec.rb --- old/spec/mysql2/result_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/mysql2/result_spec.rb 1970-01-01 01:00:00.000000000 +0100 @@ -136,7 +136,7 @@ it "should raise an exception if streaming ended due to a timeout" do # Create an extra client instance, since we're going to time it out client = Mysql2::Client.new DatabaseCredentials['root'] - client.query "CREATE TEMPORARY TABLE streamingTest (val BINARY(255))" + client.query "CREATE TEMPORARY TABLE streamingTest (val BINARY(255)) ENGINE=MEMORY" # Insert enough records to force the result set into multiple reads # (the BINARY type is used simply because it forces full width results) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/support/libmysql.def new/support/libmysql.def --- old/support/libmysql.def 1970-01-01 01:00:00.000000000 +0100 +++ new/support/libmysql.def 1970-01-01 01:00:00.000000000 +0100 @@ -0,0 +1,219 @@ +; MySQL's Connector/C ships with a libmysql.dll main library and libmysql.lib +; interface library. However, the interface library is not linkable by MinGW. +; +; At compile time, we generate a libmysql.a interface library with dlltool.exe. +; +; This def file can be re-generated using the reimp.exe or gendef.exe tools. +; +LIBRARY libmysql.dll +EXPORTS +mysql_affected_rows +mysql_affected_rows@4 +mysql_change_user +mysql_change_user@16 +mysql_character_set_name +mysql_character_set_name@4 +mysql_close +mysql_close@4 +mysql_data_seek +mysql_data_seek@12 +mysql_debug +mysql_debug@4 +mysql_dump_debug_info +mysql_dump_debug_info@4 +mysql_eof +mysql_eof@4 +mysql_errno +mysql_errno@4 +mysql_error +mysql_error@4 +mysql_escape_string +mysql_escape_string@12 +mysql_fetch_field +mysql_fetch_field@4 +mysql_fetch_field_direct +mysql_fetch_field_direct@8 +mysql_fetch_fields +mysql_fetch_fields@4 +mysql_fetch_lengths +mysql_fetch_lengths@4 +mysql_fetch_row +mysql_fetch_row@4 +mysql_field_count +mysql_field_count@4 +mysql_field_seek +mysql_field_seek@8 +mysql_field_tell +mysql_field_tell@4 +mysql_free_result +mysql_free_result@4 +mysql_get_client_info +mysql_get_client_info@0 +mysql_get_client_version +mysql_get_client_version@0 +mysql_get_host_info +mysql_get_host_info@4 +mysql_get_option +mysql_get_option@12 +mysql_get_proto_info +mysql_get_proto_info@4 +mysql_get_server_info +mysql_get_server_info@4 +mysql_get_server_version +mysql_get_server_version@4 +mysql_get_ssl_cipher +mysql_get_ssl_cipher@4 +mysql_hex_string +mysql_hex_string@12 +mysql_info +mysql_info@4 +mysql_init +mysql_init@4 +mysql_insert_id +mysql_insert_id@4 +mysql_kill +mysql_kill@8 +mysql_library_end +mysql_library_end@0 +mysql_library_init +mysql_library_init@12 +mysql_list_dbs +mysql_list_dbs@8 +mysql_list_fields +mysql_list_fields@12 +mysql_list_processes +mysql_list_processes@4 +mysql_list_tables +mysql_list_tables@8 +mysql_more_results +mysql_more_results@4 +mysql_next_result +mysql_next_result@4 +mysql_num_fields +mysql_num_fields@4 +mysql_num_rows +mysql_num_rows@4 +mysql_options +mysql_options@12 +mysql_options4 +mysql_options4@16 +mysql_ping +mysql_ping@4 +mysql_query +mysql_query@8 +mysql_read_query_result +mysql_read_query_result@4 +mysql_real_connect +mysql_real_connect@32 +mysql_real_escape_string +mysql_real_escape_string@16 +mysql_real_query +mysql_real_query@12 +mysql_refresh +mysql_refresh@8 +mysql_reset_connection +mysql_reset_connection@4 +mysql_rollback +mysql_rollback@4 +mysql_row_seek +mysql_row_seek@8 +mysql_row_tell +mysql_row_tell@4 +mysql_select_db +mysql_select_db@8 +mysql_send_query +mysql_send_query@12 +mysql_server_end +mysql_server_end@0 +mysql_server_init +mysql_server_init@12 +mysql_session_track_get_first +mysql_session_track_get_first@16 +mysql_session_track_get_next +mysql_session_track_get_next@16 +mysql_set_character_set +mysql_set_character_set@8 +mysql_set_local_infile_default +mysql_set_local_infile_default@4 +mysql_set_local_infile_handler +mysql_set_local_infile_handler@24 +mysql_set_server_option +mysql_set_server_option@8 +mysql_shutdown +mysql_shutdown@8 +mysql_sqlstate +mysql_sqlstate@4 +mysql_ssl_set +mysql_ssl_set@24 +mysql_stat +mysql_stat@4 +mysql_stmt_affected_rows +mysql_stmt_affected_rows@4 +mysql_stmt_attr_get +mysql_stmt_attr_get@12 +mysql_stmt_attr_set +mysql_stmt_attr_set@12 +mysql_stmt_bind_param +mysql_stmt_bind_param@8 +mysql_stmt_bind_result +mysql_stmt_bind_result@8 +mysql_stmt_close +mysql_stmt_close@4 +mysql_stmt_data_seek +mysql_stmt_data_seek@12 +mysql_stmt_errno +mysql_stmt_errno@4 +mysql_stmt_error +mysql_stmt_error@4 +mysql_stmt_execute +mysql_stmt_execute@4 +mysql_stmt_fetch +mysql_stmt_fetch@4 +mysql_stmt_fetch_column +mysql_stmt_fetch_column@16 +mysql_stmt_field_count +mysql_stmt_field_count@4 +mysql_stmt_free_result +mysql_stmt_free_result@4 +mysql_stmt_init +mysql_stmt_init@4 +mysql_stmt_insert_id +mysql_stmt_insert_id@4 +mysql_stmt_next_result +mysql_stmt_next_result@4 +mysql_stmt_num_rows +mysql_stmt_num_rows@4 +mysql_stmt_param_count +mysql_stmt_param_count@4 +mysql_stmt_param_metadata +mysql_stmt_param_metadata@4 +mysql_stmt_prepare +mysql_stmt_prepare@12 +mysql_stmt_reset +mysql_stmt_reset@4 +mysql_stmt_result_metadata +mysql_stmt_result_metadata@4 +mysql_stmt_row_seek +mysql_stmt_row_seek@8 +mysql_stmt_row_tell +mysql_stmt_row_tell@4 +mysql_stmt_send_long_data +mysql_stmt_send_long_data@16 +mysql_stmt_sqlstate +mysql_stmt_sqlstate@4 +mysql_stmt_store_result +mysql_stmt_store_result@4 +mysql_store_result +mysql_store_result@4 +mysql_thread_end +mysql_thread_end@0 +mysql_thread_id +mysql_thread_id@4 +mysql_thread_init +mysql_thread_init@0 +mysql_thread_safe +mysql_thread_safe@0 +mysql_use_result +mysql_use_result@4 +mysql_warning_count +mysql_warning_count@4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bitcoin for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package bitcoin for openSUSE:Factory checked in at 2015-02-18 11:39:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bitcoin (Old) and /work/SRC/openSUSE:Factory/.bitcoin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bitcoin" Changes: -------- --- /work/SRC/openSUSE:Factory/bitcoin/bitcoin.changes 2014-11-15 12:13:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bitcoin.new/bitcoin.changes 2015-02-18 12:08:42.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Feb 16 13:54:56 UTC 2015 - mpluskal(a)suse.com + +- Update to 0.10.0: + * Faster synchronization + * new REST interface + * RPC Server “Warm-Up” Mode + * Improved signing security + * Watch-only wallet support + * Consensus library + * Standard script rules relaxed for P2SH addresses + * New tool bitcoin-tx + * Mining and relay policy enhancements + * BIP 66: strict DER encoding for signatures + * for more details see https://bitcoin.org/en/release/v0.10.0 +- New package libbitcoinconsensus +- Rename package bitcoin-cli to bitcoin-tools +- Exclude ppc and ppc64 from being built - bitcoin does not support + big endian. + +------------------------------------------------------------------- +Sat Jan 31 22:54:32 UTC 2015 - mpluskal(a)suse.com + +- Enable qr support +- Run tests after build + +------------------------------------------------------------------- Old: ---- v0.9.3.tar.gz New: ---- v0.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bitcoin.spec ++++++ --- /var/tmp/diff_new_pack.Bf0BO4/_old 2015-02-18 12:08:43.000000000 +0100 +++ /var/tmp/diff_new_pack.Bf0BO4/_new 2015-02-18 12:08:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bitcoin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011-2014 P Rusnak <prusnak(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -18,13 +18,13 @@ Name: bitcoin -Version: 0.9.3 +Version: 0.10.0 Release: 0 Summary: P2P Digital Currency License: MIT Group: Productivity/Networking/Other Url: http://www.bitcoin.org -Source: https://github.com/bitcoin/bitcoin/archive/v%{version}.tar.gz +Source: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz Source1: bitcoind.service Source2: bitcoind.firewall Source3: bitcoind.conf @@ -35,17 +35,23 @@ BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: git +BuildRequires: lcov BuildRequires: libdb-4_8-devel BuildRequires: libminiupnpc-devel -BuildRequires: libopenssl-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qttools-devel -BuildRequires: protobuf-devel -BuildRequires: qrencode-devel -BuildRequires: systemd +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files +BuildRequires: yasm-devel +BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(protobuf) BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} +ExcludeArch: ppc64 ppc %description Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -54,10 +60,9 @@ %package qt5 Summary: An end-user Qt5 GUI for the Bitcoin crypto-currency -License: MIT Group: Development/Libraries/Other -Provides: bitcoin = %{version} -Obsoletes: bitcoin < %{version} +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} %description qt5 Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -66,21 +71,40 @@ This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. -%package cli +%package utils Summary: An end-user cli for the Bitcoin crypto-currency -License: MIT +Group: Productivity/Networking/Other +Provides: %{name}-cli = %{version} +Obsoletes: %{name}-cli < %{version} -%description cli +%description utils Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. Full transaction history is stored locally at each client. This requires several GB of space, slowly growing. This package provides bitcoin-cli - CLI tool to interact with the daemon. +%package -n lib%{name}consensus0 +Summary: Bitcoin consensus library +Group: System/Library + +%description -n lib%{name}consensus0 +The purpose of this library is to make the verification functionality that is critical to Bitcoin’s consensus available to other applications, e.g. to language bindings such as python-bitcoinlib or alternative node implementations. + +%package -n lib%{name}consensus-devel +Summary: Developmont files for bitcoin consensus library +Group: Development/Languages/C and C++ +Requires: lib%{name}consensus0 = %{version} + +%description -n lib%{name}consensus-devel +The purpose of this library is to make the verification functionality that is critical to Bitcoin’s consensus available to other applications, e.g. to language bindings such as python-bitcoinlib or alternative node implementations. + +This package contains development files. + %package -n bitcoind Summary: Headless daemon for Bitcoin crypto-currency -License: MIT Group: Development/Libraries/Other +Requires(pre): shadow %description -n bitcoind Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -91,7 +115,6 @@ %package test Summary: Automated tests for bitcoin client -License: MIT Group: Development/Libraries/Other %description test @@ -106,17 +129,21 @@ %patch0 -p1 %build -autoreconf -fvi +autoreconf -fi %configure \ --with-cli=yes \ --with-daemon=yes \ --with-gui=qt5 \ --with-miniupnpc \ - --disable-silent-rules + --with-qrencode + make %{?_smp_mflags} +%check +make %{?_smp_mflags} check + %install -%make_install +make DESTDIR=%{buildroot} install %{?_smp_mflags} install -D -m 0644 share/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/%{name}.png install -D -m 0644 contrib/debian/bitcoin-qt.desktop %{buildroot}%{_datadir}/applications/%{name}-qt.desktop @@ -134,6 +161,10 @@ install -d -m 0755 %{buildroot}/%{_tmpfilesdir}/ install -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/bitcoind.conf +# do not ship these +rm -rf %{buildroot}%{_libdir}/libbitcoinconsensus.a +rm -rf %{buildroot}%{_libdir}/libbitcoinconsensus.la + %post qt5 %desktop_database_post @@ -155,6 +186,10 @@ %postun -n bitcoind %service_del_postun bitcoind.service +%post -n lib%{name}consensus0 -p /sbin/ldconfig + +%postun -n lib%{name}consensus0 -p /sbin/ldconfig + %files qt5 %defattr(-,root,root) %doc COPYING README.md @@ -163,10 +198,22 @@ %{_mandir}/man1/bitcoin-qt.1%{?ext_man} %{_datadir}/pixmaps/%{name}.png -%files cli +%files utils +%defattr(-,root,root) +%doc COPYING README.md +%{_bindir}/%{name}-cli +%{_bindir}/%{name}-tx + +%files -n lib%{name}consensus0 +%defattr(-,root,root) +%doc COPYING README.md +%{_libdir}/lib%{name}consensus.so.* + +%files -n lib%{name}consensus-devel %defattr(-,root,root) %doc COPYING README.md -%{_bindir}/bitcoin-cli +%{_libdir}/lib%{name}consensus.so +%{_includedir}/%{name}consensus.h %files -n bitcoind %defattr(-,root,root) ++++++ v0.9.3.tar.gz -> v0.10.0.tar.gz ++++++ ++++ 180564 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