Accepting request 1122991 from home:jengelh:branches:server:messaging

- Remove build dependency on msgpack (this was dropped
  and replaced by "cmp" in the 0.2.18 release)
- Use standardized cmake build macros

OBS-URL: https://build.opensuse.org/request/show/1122991
OBS-URL: https://build.opensuse.org/package/show/server:messaging/c-toxcore?expand=0&rev=39
This commit is contained in:
Eric Schirra 2023-11-03 07:59:03 +00:00 committed by Git OBS Bridge
parent ecf5b3826f
commit cf60fb3b22
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 3 06:44:07 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Remove build dependency on msgpack (this was dropped
and replaced by "cmp" in the 0.2.18 release)
- Use standardized cmake build macros
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 26 11:24:56 UTC 2022 - ecsos <ecsos@opensuse.org> Sun Jun 26 11:24:56 UTC 2022 - ecsos <ecsos@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package c-toxcore # spec file for package c-toxcore
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -39,9 +39,9 @@ BuildRequires: libsodium-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libvpx-devel BuildRequires: libvpx-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(msgpack)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Requires(pre): shadow Requires(pre): shadow
Provides: bundled(cmp) = 20
%{?systemd_requires} %{?systemd_requires}
%description %description
@ -77,10 +77,10 @@ Group: System/Libraries
This are the Core library for toxcore. This are the Core library for toxcore.
%prep %prep
%setup -q %autosetup -p1
# install submodules # install submodules
pushd third_party/cmp pushd third_party/cmp
tar xvzf %{SOURCE10} --strip 1 tar -xvzf %{SOURCE10} --strip 1
popd popd
# change location of bootstrap bin # change location of bootstrap bin
sed -ri 's:%{_prefix}/local/bin/tox-bootstrapd:%{_bindir}/tox-bootstrapd:g' other/bootstrap_daemon/tox-bootstrapd.service sed -ri 's:%{_prefix}/local/bin/tox-bootstrapd:%{_bindir}/tox-bootstrapd:g' other/bootstrap_daemon/tox-bootstrapd.service
@ -91,8 +91,7 @@ sed -ri 's:Group=tox-bootstrapd:Group=toxcmd:g' other/bootstrap_daemon/tox-boots
sed -ri 's:%{_localstatedir}/lib/tox-bootstrapd/keys:%{_sysconfdir}/tox/bootstrapd/keys:g' other/bootstrap_daemon/tox-bootstrapd.conf sed -ri 's:%{_localstatedir}/lib/tox-bootstrapd/keys:%{_sysconfdir}/tox/bootstrapd/keys:g' other/bootstrap_daemon/tox-bootstrapd.conf
%build %build
pushd build %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DBUILD_TOXAV=ON \ -DBUILD_TOXAV=ON \
-DMUST_BUILD_TOXAV=ON \ -DMUST_BUILD_TOXAV=ON \
-DBOOTSTRAP_DAEMON=ON \ -DBOOTSTRAP_DAEMON=ON \
@ -100,11 +99,10 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DENABLE_STATIC=OFF \ -DENABLE_STATIC=OFF \
.. ..
make %{?_smp_mflags} %cmake_build
popd
%install %install
make install -C build PREFIX=%_prefix DESTDIR=%buildroot %cmake_install
# Install dir /var/run/graylog2-server # Install dir /var/run/graylog2-server
install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d/ install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d/