Update to 31.1

[skip changelog]

bitcoin-0.18.0-unicode.patch

@@ -1,12 +0,0 @@
-diff -Naur bitcoin-0.18.0.old/test/functional/test_runner.py bitcoin-0.18.0/test/functional/test_runner.py
---- bitcoin-0.18.0.old/test/functional/test_runner.py	2019-05-06 07:22:45.878843570 +0200
-+++ bitcoin-0.18.0/test/functional/test_runner.py	2019-05-06 08:53:37.738118588 +0200
-@@ -249,7 +249,7 @@
-     logging.basicConfig(format='%(message)s', level=logging_level)
- 
-     # Create base test directory
--    tmpdir = "%s/test_runner_₿_🏃_%s" % (args.tmpdirprefix, datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
-+    tmpdir = "%s/test_runner_%s" % (args.tmpdirprefix, datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
- 
-     os.makedirs(tmpdir)
- 

bitcoin-core.spec

@@ -5,7 +5,7 @@
 %bcond_with extended_tests
 
 Name:       bitcoin-core
-Version:    30.2
+Version:    31.1
 Release:    %autorelease
 Summary:    Peer to Peer Cryptographic Currency
 License:    MIT
@@ -106,11 +106,13 @@ issuing of bitcoins is carried out collectively by the network.
 This package contains the Qt based graphical client and node. If you are looking
 to run a Bitcoin wallet, this is probably the package you want.
 
-%package devel
+%package -n libbitcoinkernel-devel
 Summary:    Peer-to-peer digital currency
 Requires:   lib%{project_name}kernel = %{version}-%{release}
+Obsoletes:  %{name}-devel < %{version}-%{release}
+Provides:   %{name}-devel = %{version}-%{release}
 
-%description devel
+%description -n libbitcoinkernel-devel
 This package contains the bitcoin utility tool.
 
 Most people do not need this package installed.
@@ -136,6 +138,8 @@ Provides:   bundled(libmultiprocess)
 Provides:   bundled(secp256k1)
 Provides:   bundled(univalue)
 
+%{?sysusers_requires_compat}
+
 %description server
 This package provides a stand-alone %{name} daemon. For most users, this
 package is only needed if they need a full-node without the graphical client.
@@ -160,7 +164,6 @@ grep -q $(sha256sum %{SOURCE0}) %{SOURCE2}
 cp -p %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} .
 
 %build
-
 # Bitcoin kernel library used only as part of the testing for now:
 %cmake \
     -DBUILD_CLI=ON \
@@ -187,6 +190,11 @@ cp -p %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} .
 
 find %{buildroot} -name "*.la" -delete
 
+# TODO: Upstream puts bitcoind in the wrong directory. Need to fix the
+# upstream Makefiles to install it in the correct place.
+mkdir -p -m 755 %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/bitcoind %{buildroot}%{_sbindir}/bitcoind
+
 # Temporary files
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{project_name}.conf
@@ -233,6 +241,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{project_name
 test/functional/test_runner.py --tmpdirprefix `pwd` --extended
 %endif
 
+%pre
+%sysusers_create_compat %{SOURCE11}
+
 %post server
 %systemd_post %{project_name}.service
 
@@ -266,9 +277,10 @@ test/functional/test_runner.py --tmpdirprefix `pwd` --extended
 %{_mandir}/man1/%{project_name}-qt.1*
 %{_metainfodir}/%{project_name}-qt.metainfo.xml
 
-%files devel
+%files -n libbitcoinkernel-devel
 %doc doc/developer-notes.md
 %{_bindir}/%{project_name}-util
+%{_includedir}/bitcoinkernel.h
 %{_libdir}/pkgconfig/lib%{project_name}kernel.pc
 %{_libdir}/lib%{project_name}kernel.so
 %{_mandir}/man1/%{project_name}-util.1*
@@ -299,7 +311,7 @@ test/functional/test_runner.py --tmpdirprefix `pwd` --extended
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/%{project_name}
 %{_compldir}/%{project_name}d
 %{_mandir}/man1/%{project_name}d.1*
-%{_bindir}/%{project_name}d
+%{_sbindir}/%{project_name}d
 %{_tmpfilesdir}/%{project_name}.conf
 %{_unitdir}/%{project_name}.service
 %{_userunitdir}/%{project_name}.service

bitcoin-shared.patch

@@ -1,9 +1,9 @@
-diff -Naur bitcoin-30.0.old/src/kernel/CMakeLists.txt bitcoin-30.0/src/kernel/CMakeLists.txt
---- bitcoin-30.0.old/src/kernel/CMakeLists.txt	2025-10-16 18:35:05.538795833 +0200
-+++ bitcoin-30.0/src/kernel/CMakeLists.txt	2025-10-16 18:37:54.715894722 +0200
-@@ -124,3 +124,5 @@
-     DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT libbitcoinkernel
+diff -Naur bitcoin-31.0.old/src/kernel/CMakeLists.txt bitcoin-31.0/src/kernel/CMakeLists.txt
+--- bitcoin-31.0.old/src/kernel/CMakeLists.txt	2026-05-02 14:25:10.580188155 +0200
++++ bitcoin-31.0/src/kernel/CMakeLists.txt	2026-05-02 14:24:18.176261510 +0200
+@@ -135,3 +135,5 @@
  )
+ 
+ install(FILES bitcoinkernel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT libbitcoinkernel)
 +
 +set_target_properties(bitcoinkernel PROPERTIES VERSION ${CLIENT_VERSION_MAJOR}.${CLIENT_VERSION_MINOR} SOVERSION ${CLIENT_VERSION_MAJOR})

bitcoin.service.system

@@ -4,7 +4,7 @@ Documentation=man:bitcoind(1)
 After=syslog.target network.target
 
 [Service]
-ExecStart=/usr/bin/bitcoind -conf=${CONFIG_FILE} -datadir=${DATA_DIR} -pid=${PID_FILE} -debuglogfile=${DEBUG_FILE} $OPTIONS
+ExecStart=/usr/sbin/bitcoind -conf=${CONFIG_FILE} -datadir=${DATA_DIR} -pid=${PID_FILE} -debuglogfile=${DEBUG_FILE} $OPTIONS
 EnvironmentFile=/etc/sysconfig/bitcoin
 User=bitcoin
 Group=bitcoin

bitcoin.service.user

@@ -3,7 +3,7 @@ Description=Bitcoin daemon
 Documentation=man:bitcoind(1)
 
 [Service]
-ExecStart=/usr/bin/bitcoind
+ExecStart=/usr/sbin/bitcoind
 
 Restart=on-failure
 TimeoutStopSec=120

changelog

@@ -1,21 +1,6 @@
 * Sun Apr 13 2025 Simone Caronni <negativo17@gmail.com> - 29.0-1
 - Update to 29.0.
 
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 28.1-6
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Fri Feb 07 2025 Simone Caronni <negativo17@gmail.com> - 28.1-5
-- Rebuild for updated dependencies.
-
-* Tue Jan 28 2025 Simone Caronni <negativo17@gmail.com> - 28.1-4
-- Rebuild for updated dependencies.
-
-* Tue Jan 28 2025 Simone Caronni <negativo17@gmail.com> - 28.1-3
-- Update for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin.
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 28.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
 * Sat Jan 11 2025 Simone Caronni <negativo17@gmail.com> - 28.1-1
 - Update to 28.1.
 

sources

@@ -1,3 +1,3 @@
-SHA512 (bitcoin-30.2.tar.gz) = 4fcdb70a016f9ad1b44539f19d61d4c9ce06d92f947be156f8d5de29026aa90a17cea8dcd0bd9bf2f7ad959a4b79d851de95a1c0d2ab87862e04c26cf89f493b
-SHA512 (SHA256SUMS) = 99df424cfe37197df15c3e12890ba0b3e9fa00d75f4466f36e220d5d9a361c472d140ce9e7e050181e2a41d39f1af6f0c8fe87e1db9bea7a2fc6000b228aed12
-SHA512 (SHA256SUMS.asc) = 1bb28324b7807eaf8bd828039954698cfdbb4ac79ae09a58f84f798ed9da1178ce57459fd7586e51ab514983531045b2a33a28361e4ba302c5527104d0474d53
+SHA512 (bitcoin-31.1.tar.gz) = df6c197f7290ba12be78f062e0a9f8750936b5ebe0078b93f18d7cf1e9f511f67e437b8cf12d2f57d26bc4ae71d112a071040a09344092bf587d973e76a0460f
+SHA512 (SHA256SUMS) = 0503c1ea78d0407261046622f3eed43e0e7be2818a4d3c71345fee708302533a921d620746d9bec323728282e0d2a5affbd212c3004bbed99c09bf3bbb3127df
+SHA512 (SHA256SUMS.asc) = f85b805d6a4ee43b50545b74167efabbef979339a0c18457ac817a01364f8042818d9a1ad8f4ae6c37a4a3579b1decad4f501969fa47c8715f2548bca136d62c