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
This commit is contained in:
Eric Schirra 2023-11-10 11:35:01 +00:00 committed by Git OBS Bridge
parent cf60fb3b22
commit 28a6293177
2 changed files with 9 additions and 14 deletions

View File

@ -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>

View File

@ -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/