Accepting request 561276 from network:cryptocurrencies
OBS-URL: https://build.opensuse.org/request/show/561276 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bitcoin?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
20371b3bac
commit
ba27fb42e5
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a2d28632be6918ce23d2fd589f0aecbb2a90579c9345f47fdfe1e77ec31f023e
|
||||
size 7504139
|
||||
3
bitcoin-0.15.1.tar.gz
Normal file
3
bitcoin-0.15.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:98b3a98a67054123bef6714e4035e18f9250a1b6d63829258ad057906e75d8b1
|
||||
size 7547736
|
||||
82
bitcoin-boost_1_66.patch
Normal file
82
bitcoin-boost_1_66.patch
Normal file
@ -0,0 +1,82 @@
|
||||
From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001
|
||||
From: Suhas Daftuar <sdaftuar@gmail.com>
|
||||
Date: Thu, 7 Dec 2017 09:57:53 -0500
|
||||
Subject: [PATCH] Make boost::multi_index comparators const
|
||||
|
||||
This fixes compatibility with boost 1.66
|
||||
---
|
||||
src/miner.h | 4 ++--
|
||||
src/txmempool.h | 10 +++++-----
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/miner.h b/src/miner.h
|
||||
index 36276dc362c5..d81ec6421cb8 100644
|
||||
--- a/src/miner.h
|
||||
+++ b/src/miner.h
|
||||
@@ -71,7 +71,7 @@ struct modifiedentry_iter {
|
||||
// except operating on CTxMemPoolModifiedEntry.
|
||||
// TODO: refactor to avoid duplication of this logic.
|
||||
struct CompareModifiedEntry {
|
||||
- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
|
||||
+ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const
|
||||
{
|
||||
double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
|
||||
double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
|
||||
@@ -86,7 +86,7 @@ struct CompareModifiedEntry {
|
||||
// This is sufficient to sort an ancestor package in an order that is valid
|
||||
// to appear in a block.
|
||||
struct CompareTxIterByAncestorCount {
|
||||
- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
|
||||
+ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const
|
||||
{
|
||||
if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
|
||||
return a->GetCountWithAncestors() < b->GetCountWithAncestors();
|
||||
diff --git a/src/txmempool.h b/src/txmempool.h
|
||||
index 346585ab115e..86a008d7b211 100644
|
||||
--- a/src/txmempool.h
|
||||
+++ b/src/txmempool.h
|
||||
@@ -204,7 +204,7 @@ struct mempoolentry_txid
|
||||
class CompareTxMemPoolEntryByDescendantScore
|
||||
{
|
||||
public:
|
||||
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
||||
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
||||
{
|
||||
bool fUseADescendants = UseDescendantScore(a);
|
||||
bool fUseBDescendants = UseDescendantScore(b);
|
||||
@@ -226,7 +226,7 @@ class CompareTxMemPoolEntryByDescendantScore
|
||||
}
|
||||
|
||||
// Calculate which score to use for an entry (avoiding division).
|
||||
- bool UseDescendantScore(const CTxMemPoolEntry &a)
|
||||
+ bool UseDescendantScore(const CTxMemPoolEntry &a) const
|
||||
{
|
||||
double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
|
||||
double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
|
||||
@@ -241,7 +241,7 @@ class CompareTxMemPoolEntryByDescendantScore
|
||||
class CompareTxMemPoolEntryByScore
|
||||
{
|
||||
public:
|
||||
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
||||
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
||||
{
|
||||
double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
|
||||
double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
|
||||
@@ -255,7 +255,7 @@ class CompareTxMemPoolEntryByScore
|
||||
class CompareTxMemPoolEntryByEntryTime
|
||||
{
|
||||
public:
|
||||
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
||||
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
||||
{
|
||||
return a.GetTime() < b.GetTime();
|
||||
}
|
||||
@@ -264,7 +264,7 @@ class CompareTxMemPoolEntryByEntryTime
|
||||
class CompareTxMemPoolEntryByAncestorFee
|
||||
{
|
||||
public:
|
||||
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
||||
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
||||
{
|
||||
double aFees = a.GetModFeesWithAncestors();
|
||||
double aSize = a.GetSizeWithAncestors();
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 2 21:13:00 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Trim redundant wording from description.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 1 09:39:27 UTC 2018 - mpluskal@suse.com
|
||||
|
||||
- Update to version 0.15.1:
|
||||
* Network fork safety enhancements
|
||||
* Miner block size limiting deprecated
|
||||
* GUI settings backed up on reset
|
||||
* Duplicate wallets disallowed
|
||||
* Debug -minimumchainwork argument added
|
||||
* Low-level RPC changes
|
||||
- Fix building with current boost:
|
||||
* bitcoin-boost_1_66.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 9 09:12:56 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
||||
23
bitcoin.spec
23
bitcoin.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package bitcoin
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2011-2014 P Rusnak <prusnak@opensuse.org>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -24,7 +24,7 @@
|
||||
%define consensus 1
|
||||
%define is_base 1
|
||||
Name: bitcoin
|
||||
Version: 0.15.0.1
|
||||
Version: 0.15.1
|
||||
Release: 0
|
||||
Summary: P2P Digital Currency
|
||||
License: MIT
|
||||
@ -34,6 +34,7 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%
|
||||
Source1: %{base}d.service
|
||||
Source2: %{base}d.firewall
|
||||
Source3: %{base}d.conf
|
||||
Patch0: bitcoin-boost_1_66.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc-c++
|
||||
@ -67,8 +68,8 @@ BuildRequires: boost-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{name_pretty} is a free open source peer-to-peer electronic cash system
|
||||
%{that} is completely decentralized, without the need for a central server or
|
||||
%{name_pretty} is a 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.
|
||||
@ -83,7 +84,7 @@ Requires(post): update-desktop-files
|
||||
Requires(postun): update-desktop-files
|
||||
|
||||
%description qt5
|
||||
%{name_pretty} is a free open source peer-to-peer electronic cash system
|
||||
%{name_pretty} is a 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
|
||||
@ -96,11 +97,11 @@ This package provides %{name_pretty}-Qt, a GUI for %{name_pretty} based on
|
||||
Qt.
|
||||
|
||||
%package utils
|
||||
Summary: An end-user cli for the %{name_pretty} crypto-currency
|
||||
Summary: An end-user CLI for the %{name_pretty} crypto-currency
|
||||
Group: Productivity/Networking/Other
|
||||
|
||||
%description utils
|
||||
%{name_pretty} is a free open source peer-to-peer electronic cash system
|
||||
%{name_pretty} is a 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
|
||||
@ -109,7 +110,7 @@ for double-spending.
|
||||
Full transaction history is stored locally at each client. This requires
|
||||
several GB of space, slowly growing.
|
||||
|
||||
This package provides %{name}-cli - CLI tool to interact with the daemon.
|
||||
This package provides %{name}-cli — a CLI tool to interact with the daemon.
|
||||
|
||||
%if %{consensus} == 1
|
||||
%package -n lib%{name}consensus0
|
||||
@ -141,7 +142,7 @@ Summary: Headless daemon for %{name_pretty} crypto-currency
|
||||
Group: Development/Libraries/Other
|
||||
|
||||
%description -n %{name}d
|
||||
%{name_pretty} is a free open source peer-to-peer electronic cash system
|
||||
%{name_pretty} is a 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
|
||||
@ -157,7 +158,7 @@ Summary: Automated tests for %{name} client
|
||||
Group: Development/Libraries/Other
|
||||
|
||||
%description test
|
||||
%{name_pretty} is a free open source peer-to-peer electronic cash system
|
||||
%{name_pretty} is a 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
|
||||
@ -170,7 +171,7 @@ This package provides automated tests for %{name}-qt5 and %{name}d.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
# remove 128 resolution from Icon= line
|
||||
sed -i s/128// contrib/debian/%{name}-qt.desktop
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user