Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package monero for openSUSE:Factory checked
in at 2021-04-06 17:31:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monero (Old)
and /work/SRC/openSUSE:Factory/.monero.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monero"
Tue Apr 6 17:31:04 2021 rev:4 rq:883312 version:0.17.1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/monero/monero.changes 2021-01-28
21:22:41.447665251 +0100
+++ /work/SRC/openSUSE:Factory/.monero.new.2401/monero.changes 2021-04-06
17:32:41.631321395 +0200
@@ -1,0 +2,7 @@
+Tue Apr 6 08:42:10 UTC 2021 - Martin Pluskal <mplus...@suse.com>
+
+- Cleanup spec file with spec-cleaner
+- Drop static libraries and html documentation
+- Adjust _constraints
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monero.spec ++++++
--- /var/tmp/diff_new_pack.cscDH6/_old 2021-04-06 17:32:42.487322363 +0200
+++ /var/tmp/diff_new_pack.cscDH6/_new 2021-04-06 17:32:42.491322367 +0200
@@ -16,6 +16,25 @@
#
+# set binary names
+%define daemon_name %{name}d
+%define display_name Monero
+%define cli_name %{name}-wallet-cli
+%define rpc_name %{name}-wallet-rpc
+%define gen_name %{name}-gen-trusted-multisig
+%define bc_ancestry_name %{name}-blockchain-ancestry
+%define bc_depth_name %{name}-blockchain-depth
+%define bc_export_name %{name}-blockchain-export
+%define bc_import_name %{name}-blockchain-import
+%define bc_outputs_name %{name}-blockchain-mark-spent-outputs
+%define bc_usage_name %{name}-blockchain-usage
+# set ports
+%define p2p_port 18080
+%define rpc_port 18081
+%define description_text_1 Monero is a private, secure, untraceable,
decentralised digital currency. You are your bank, you control your funds, and
nobody can trace your transfers unless you allow them to do so.
+%define description_text_2 Privacy: Monero uses a cryptographically sound
system to allow you to send and receive funds without your transactions being
easily revealed on the blockchain (the ledger of transactions that everyone
has). This ensures that your purchases, receipts, and all transfers remain
absolutely private by default.
+%define description_text_3 Security: Using the power of a distributed
peer-to-peer consensus network, every transaction on the network is
cryptographically secured. Individual wallets have a 24 word mnemonic seed that
is only displayed once, and can be written down to backup the wallet. Wallet
files are encrypted with a passphrase to ensure they are useless if stolen.
+%define description_text_4 Untraceability: By taking advantage of ring
signatures, a special property of a certain type of cryptography, Monero is
able to ensure that transactions are not only untraceable, but have an optional
measure of ambiguity that ensures that transactions cannot easily be tied back
to an individual user or computer.
Name: monero
Version: 0.17.1.9
Release: 0
@@ -24,7 +43,10 @@
Group: Productivity/Networking/Other
URL: https://get%{name}.org/
Source0: %{name}-%{version}.tar.gz
-%if 0%{?suse_version} > 1320
+BuildRequires: cmake >= 3.0
+BuildRequires: cppzmq-devel
+BuildRequires: gcc-c++ >= 4.7.3
+BuildRequires: ldns-devel >= 1.6.17
BuildRequires: libboost_chrono-devel
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
@@ -34,56 +56,19 @@
BuildRequires: libboost_serialization-devel
BuildRequires: libboost_system-devel
BuildRequires: libboost_thread-devel
-%else
-%if 0%{?is_opensuse} && 0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200
-BuildRequires: boost-devel >= 1.58
-%else
-BuildRequires: boost_1_58_0-devel
-%endif
-%endif
-BuildRequires: cmake >= 3.0
-BuildRequires: cppzmq-devel
-BuildRequires: doxygen
-BuildRequires: fdupes
-BuildRequires: gcc-c++ >= 4.7.3
-BuildRequires: graphviz
-BuildRequires: ldns-devel >= 1.6.17
BuildRequires: libevent-devel >= 2.0
BuildRequires: libexpat-devel >= 1.1
BuildRequires: libminiupnpc-devel >= 2.0
BuildRequires: libopenssl-devel
BuildRequires: libsodium-devel
BuildRequires: libunwind-devel
-BuildRequires: pkg-config
+BuildRequires: ninja
+BuildRequires: pkgconfig
BuildRequires: readline-devel
-%if 0%{?is_opensuse} && 0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200
BuildRequires: shadow
-%endif
BuildRequires: unbound-devel >= 1.4.16
BuildRequires: xz-devel
-# set binary names
-%define daemon_name %{name}d
-%define display_name Monero
-%define cli_name %{name}-wallet-cli
-%define rpc_name %{name}-wallet-rpc
-%define gen_name %{name}-gen-trusted-multisig
-%define bc_ancestry_name %{name}-blockchain-ancestry
-%define bc_depth_name %{name}-blockchain-depth
-%define bc_export_name %{name}-blockchain-export
-%define bc_import_name %{name}-blockchain-import
-%define bc_outputs_name %{name}-blockchain-mark-spent-outputs
-%define bc_usage_name %{name}-blockchain-usage
-
-# set ports
-%define p2p_port 18080
-%define rpc_port 18081
-
-%define description_text_1 Monero is a private, secure, untraceable,
decentralised digital currency. You are your bank, you control your funds, and
nobody can trace your transfers unless you allow them to do so.
-%define description_text_2 Privacy: Monero uses a cryptographically sound
system to allow you to send and receive funds without your transactions being
easily revealed on the blockchain (the ledger of transactions that everyone
has). This ensures that your purchases, receipts, and all transfers remain
absolutely private by default.
-%define description_text_3 Security: Using the power of a distributed
peer-to-peer consensus network, every transaction on the network is
cryptographically secured. Individual wallets have a 24 word mnemonic seed that
is only displayed once, and can be written down to backup the wallet. Wallet
files are encrypted with a passphrase to ensure they are useless if stolen.
-%define description_text_4 Untraceability: By taking advantage of ring
signatures, a special property of a certain type of cryptography, Monero is
able to ensure that transactions are not only untraceable, but have an optional
measure of ambiguity that ensures that transactions cannot easily be tied back
to an individual user or computer.
-
%description
%{description_text_1}
%{description_text_2}
@@ -126,112 +111,53 @@
The %{name}-devel package contains libraries and header files for developing
applications that use %{name}.
-%package devel-static
-Summary: Development files for %{name}
-Group: Development/Libraries/C and C++
-Requires: %{name}-devel = %{version}
-
-%description devel-static
-%{description_text_1}
-%{description_text_2}
-%{description_text_3}
-%{description_text_4}
-
-This package provides static libraries for %{name}.
-
-%package doc
-Summary: Documentation for %{name}
-Group: Documentation/Man
-BuildArch: noarch
-
-%description doc
-%{description_text_1}
-%{description_text_2}
-%{description_text_3}
-%{description_text_4}
-
-This package contains the documentation for %{name}.
-
%prep
%autosetup -p1
# setup systemd service
-%{__sed} -i 's#^Description=Monero Full Node$#Description=%{display_name}
Daemon#g' utils/systemd/%{daemon_name}.service
-%{__sed} -i
's#^PIDFile=/run/monero/monerod.pid$#PIDFile=%{_rundir}/%{name}/%{daemon_name}.pid#g'
utils/systemd/%{daemon_name}.service
-%{__sed} -i 's#^ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf
\\$#ExecStart=%{_bindir}/%{daemon_name} --detach --pidfile
%{_rundir}/%{name}/%{daemon_name}.pid --config-file=%{_sysconfdir}/%{name}.conf
--data-dir=%{_localstatedir}/lib/%{name}#g' utils/systemd/%{daemon_name}.service
-%{__sed} -i 's#^ --detach --pidfile
/run/monero/monerod.pid#ExecReload=/bin/kill -HUP \$MAINPID#g'
utils/systemd/%{daemon_name}.service
-%{__sed} -i 's#^User=monero$#User=%{name}#g'
utils/systemd/%{daemon_name}.service
-%{__sed} -i 's#^Group=monero$#Group=%{name}#g'
utils/systemd/%{daemon_name}.service
+sed -i 's#^Description=Monero Full Node$#Description=%{display_name} Daemon#g'
utils/systemd/%{daemon_name}.service
+sed -i
's#^PIDFile=/run/monero/monerod.pid$#PIDFile=%{_rundir}/%{name}/%{daemon_name}.pid#g'
utils/systemd/%{daemon_name}.service
+sed -i 's#^ExecStart=%{_bindir}/monerod --config-file
%{_sysconfdir}/monerod.conf \\$#ExecStart=%{_bindir}/%{daemon_name} --detach
--pidfile %{_rundir}/%{name}/%{daemon_name}.pid
--config-file=%{_sysconfdir}/%{name}.conf
--data-dir=%{_localstatedir}/lib/%{name}#g' utils/systemd/%{daemon_name}.service
+sed -i 's#^ --detach --pidfile /run/monero/monerod.pid#ExecReload=/bin/kill
-HUP \$MAINPID#g' utils/systemd/%{daemon_name}.service
+sed -i 's#^User=monero$#User=%{name}#g' utils/systemd/%{daemon_name}.service
+sed -i 's#^Group=monero$#Group=%{name}#g' utils/systemd/%{daemon_name}.service
# setup default config file
-%{__sed} -i 's#monerod#%{daemon_name}#g' utils/conf/%{daemon_name}.conf
-%{__sed} -i
's#^data-dir=/var/lib/monero$#data-dir=%{_localstatedir}/lib/%{name}#g'
utils/conf/%{daemon_name}.conf
-%{__sed} -i
's#wlog-file=/var/log/monero/monero.log$#log-file=%{_localstatedir}/log/%{name}/%{name}.log#g'
utils/conf/%{daemon_name}.conf
+sed -i 's#monerod#%{daemon_name}#g' utils/conf/%{daemon_name}.conf
+sed -i
's#^data-dir=%{_localstatedir}/lib/monero$#data-dir=%{_localstatedir}/lib/%{name}#g'
utils/conf/%{daemon_name}.conf
+sed -i
's#wlog-file=%{_localstatedir}/log/monero/monero.log$#log-file=%{_localstatedir}/log/%{name}/%{name}.log#g'
utils/conf/%{daemon_name}.conf
# setup run folder
echo "d %{_rundir}/%{name} 0770 root %{name}" > rundir.conf
%build
-%{__mkdir_p} build/release
-cd build/release
-%{__cmake} -DARCH=default -DBUILD_TESTS=OFF -DBUILD_GUI_DEPS=ON
-DCMAKE_BUILD_TYPE=release ../..
-%make_jobs
-%{__strip} -s bin/%{daemon_name}
-%{__strip} -s bin/%{cli_name}
-%{__strip} -s bin/%{rpc_name}
-%{__strip} -s bin/%{gen_name}
-%{__strip} -s bin/%{bc_ancestry_name}
-%{__strip} -s bin/%{bc_depth_name}
-%{__strip} -s bin/%{bc_export_name}
-%{__strip} -s bin/%{bc_import_name}
-%{__strip} -s bin/%{bc_outputs_name}
-%{__strip} -s bin/%{bc_usage_name}
-cd ../..
-HAVE_DOT=YES %{_bindir}/doxygen Doxyfile
+%define __builder ninja
+%cmake \
+ -DARCH=default \
+ -DBUILD_TESTS=OFF \
+ -DBUILD_GUI_DEPS=ON \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags}" \
+ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags}" \
+ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags}"
+%cmake_build
%install
-# install binaries
-%{__install} -D -m 0755 build/release/bin/%{daemon_name}
%{buildroot}%{_bindir}/%{daemon_name}
-%{__install} -D -m 0755 build/release/bin/%{cli_name}
%{buildroot}%{_bindir}/%{cli_name}
-%{__install} -D -m 0755 build/release/bin/%{rpc_name}
%{buildroot}%{_bindir}/%{rpc_name}
-%{__install} -D -m 0755 build/release/bin/%{gen_name}
%{buildroot}%{_bindir}/%{gen_name}
-%{__install} -D -m 0755 build/release/bin/%{bc_ancestry_name}
%{buildroot}%{_bindir}/%{bc_ancestry_name}
-%{__install} -D -m 0755 build/release/bin/%{bc_depth_name}
%{buildroot}%{_bindir}/%{bc_depth_name}
-%{__install} -D -m 0755 build/release/bin/%{bc_export_name}
%{buildroot}%{_bindir}/%{bc_export_name}
-%{__install} -D -m 0755 build/release/bin/%{bc_import_name}
%{buildroot}%{_bindir}/%{bc_import_name}
-%{__install} -D -m 0755 build/release/bin/%{bc_outputs_name}
%{buildroot}%{_bindir}/%{bc_outputs_name}
-%{__install} -D -m 0755 build/release/bin/%{bc_usage_name}
%{buildroot}%{_bindir}/%{bc_usage_name}
-
-# install libraries
-%{__install} -d -m 0755 %{buildroot}%{_includedir}/%{name}/epee/net
%{buildroot}%{_includedir}/%{name}/epee/serialization
%{buildroot}%{_includedir}/%{name}/epee/storages
-%{__install} -D -m 0644 -t %{buildroot}%{_includedir}/%{name}/epee
contrib/epee/include/*.h
-%{__install} -D -m 0644 -t %{buildroot}%{_includedir}/%{name}/epee/net
contrib/epee/include/net/*.h
-%{__install} -D -m 0644 -t
%{buildroot}%{_includedir}/%{name}/epee/serialization
contrib/epee/include/serialization/*.h
-%{__install} -D -m 0644 -t %{buildroot}%{_includedir}/%{name}/epee/storages
contrib/epee/include/storages/*.h
-%{__install} -D -m 0644 src/wallet/api/wallet2_api.h
%{buildroot}%{_includedir}/%{name}/wallet/api/wallet2_api.h
-%{__install} -D -m 0644 build/release/contrib/epee/src/libepee.a
%{buildroot}%{_libdir}/libepee.a
-%{__install} -D -m 0644 build/release/contrib/epee/src/libepee_readline.a
%{buildroot}%{_libdir}/libepee_readline.a
-%{__install} -D -m 0644 build/release/lib/libwallet.a
%{buildroot}%{_libdir}/libwallet.a
-%{__install} -D -m 0644 build/release/lib/libwallet_merged.a
%{buildroot}%{_libdir}/libwallet_merged.a
+%cmake_install
+
+# remove not needed static libraries
+rm -rf %{buildroot}%{_prefix}/lib*
# install daemon supplementary files
-%{__install} -D -m 0644 utils/conf/%{daemon_name}.conf
%{buildroot}%{_sysconfdir}/%{name}.conf
-%{__install} -D -m 0644 utils/systemd/%{daemon_name}.service
%{buildroot}%{_unitdir}/%{daemon_name}.service
-%{__mkdir_p} %{buildroot}%{_localstatedir}/lib/%{name}
-%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
-%{__install} -d -m 0755 %{buildroot}%{_sbindir}
-%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{daemon_name}
+install -D -m 0644 utils/conf/%{daemon_name}.conf
%{buildroot}%{_sysconfdir}/%{name}.conf
+install -D -m 0644 utils/systemd/%{daemon_name}.service
%{buildroot}%{_unitdir}/%{daemon_name}.service
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+install -d -m 0755 %{buildroot}%{_sbindir}
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{daemon_name}
# install run folder configuration
-%{__install} -D -m 0644 rundir.conf
%{buildroot}/%{_tmpfilesdir}/%{name}_rundir.conf
-
-# install documentation
-%{__install} -d -m 0755 %{buildroot}%{_defaultdocdir}/%{name}
-%{__install} -m 0644 -p -t %{buildroot}%{_defaultdocdir}/%{name}
CONTRIBUTING.md README.i18n.md README.md
-%{__install} -d -m 0755 %{buildroot}%{_defaultlicensedir}/%{name}
-%{__install} -m 0644 -p -t %{buildroot}%{_defaultlicensedir}/%{name} LICENSE
-%{__cp} -a doc/html %{buildroot}%{_defaultdocdir}/%{name}/
-%fdupes %{buildroot}%{_defaultdocdir}/%{name}
+install -D -m 0644 rundir.conf %{buildroot}/%{_tmpfilesdir}/%{name}_rundir.conf
%pre -n %{daemon_name}
getent group %{name} > /dev/null || groupadd -r %{name}
@@ -253,20 +179,23 @@
%service_del_postun %{daemon_name}.service
%files utils
-%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/%{cli_name}
-%attr(755,root,root) %{_bindir}/%{rpc_name}
-%attr(755,root,root) %{_bindir}/%{gen_name}
-%attr(755,root,root) %{_bindir}/%{bc_ancestry_name}
-%attr(755,root,root) %{_bindir}/%{bc_depth_name}
-%attr(755,root,root) %{_bindir}/%{bc_export_name}
-%attr(755,root,root) %{_bindir}/%{bc_import_name}
-%attr(755,root,root) %{_bindir}/%{bc_outputs_name}
-%attr(755,root,root) %{_bindir}/%{bc_usage_name}
+%{_bindir}/%{cli_name}
+%{_bindir}/%{rpc_name}
+%{_bindir}/%{gen_name}
+%{_bindir}/%{bc_ancestry_name}
+%{_bindir}/%{bc_depth_name}
+%{_bindir}/%{bc_export_name}
+%{_bindir}/%{bc_import_name}
+%{_bindir}/%{bc_outputs_name}
+%{_bindir}/%{bc_usage_name}
+%{_bindir}/monero-blockchain-prune
+%{_bindir}/monero-blockchain-prune-known-spent-data
+%{_bindir}/monero-blockchain-stats
+%{_bindir}/monero-gen-ssl-cert
%files -n %{daemon_name}
-%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/%{daemon_name}
+%license LICENSE
+%{_bindir}/%{daemon_name}
%{_sbindir}/rc%{daemon_name}
%{_unitdir}/%{daemon_name}.service
%config(noreplace) %{_sysconfdir}/%{name}.conf
@@ -277,16 +206,6 @@
%{_tmpfilesdir}/%{name}_rundir.conf
%files devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}
-
-%files devel-static
-%defattr(-,root,root,-)
-%attr(644,root,root) %{_libdir}/*.a
-
-%files doc
-%defattr(-,root,root,-)
-%{_defaultdocdir}/%{name}/
-%{_defaultlicensedir}/%{name}/
+%{_includedir}/wallet
%changelog
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.cscDH6/_old 2021-04-06 17:32:42.511322390 +0200
+++ /var/tmp/diff_new_pack.cscDH6/_new 2021-04-06 17:32:42.515322395 +0200
@@ -1,7 +1,20 @@
<constraints>
<hardware>
- <memory>
- <size unit="M">12288</size>
- </memory>
+ <disk>
+ <size unit="G">16</size>
+ </disk>
+ <physicalmemory>
+ <size unit="G">8</size>
+ </physicalmemory>
</hardware>
-</constraints>
+ <overwrite>
+ <conditions>
+ <arch>x86_64</arch>
+ </conditions>
+ <hardware>
+ <memory>
+ <size unit="G">24</size>
+ </memory>
+ </hardware>
+ </overwrite>
+</constraints>
\ No newline at end of file
