From 28a62931776310916e69c54b7f37d52a72a068900f5841ff827f6c1d88bb02aa Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Fri, 10 Nov 2023 11:35:01 +0000
Subject: [PATCH] Accepting request 1124860 from server:messaging

Rollback because of declined from factory.
https://build.opensuse.org/request/show/1123095

OBS-URL: https://build.opensuse.org/request/show/1124860
OBS-URL: https://build.opensuse.org/package/show/server:messaging/c-toxcore?expand=0&rev=40
---
 c-toxcore.changes |  7 -------
 c-toxcore.spec    | 16 +++++++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)

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