From bdc483dcb97db80edac8bcb51847d16342a80d153f9b98035377014552850091 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 May 2022 12:40:06 +0000 Subject: [PATCH] - Remove include header editing; the issue once present in libsrtp 2.0.0 seems reasonably resolved in current 2.4.2 [boo#1198887] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libsrtp2?expand=0&rev=14 --- libsrtp2.changes | 7 +++++++ libsrtp2.spec | 14 +------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/libsrtp2.changes b/libsrtp2.changes index e49cdda..8933842 100644 --- a/libsrtp2.changes +++ b/libsrtp2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 4 12:39:03 UTC 2022 - Jan Engelhardt + +- Remove include header editing; the issue once present in + libsrtp 2.0.0 seems reasonably resolved in current 2.4.2 + [boo#1198887] + ------------------------------------------------------------------- Tue Sep 21 19:13:21 UTC 2021 - Jan Engelhardt diff --git a/libsrtp2.spec b/libsrtp2.spec index 05c836a..9af32a6 100644 --- a/libsrtp2.spec +++ b/libsrtp2.spec @@ -1,7 +1,7 @@ # # spec file for package libsrtp2 # -# Copyright (c) 2021 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 @@ -71,18 +71,6 @@ This subpackage contains the development headers. %install %make_install -# Same post-install modifications as for libsrtp v1. -# -# Including of files with generic names and quotes is unsafe and can cause include clashes. -# Do it in install phase, because rewriting of the source code before building would require deeper changes. -# %%_includedir is included automatically, so we don't modify .pc file. (bnc#839475#c2) -echo "Rewriting #include \"{foo}.h\" to #include ..." -sed -i 's|\( *# *include *\)"\([^"]*\.h\)"|\1 |' %buildroot/%_includedir/srtp2/*.h - -# Rewrite FOO_H just to make things consistent and prevent name clashes. -echo "Rewriting header include check tags from {FOO_H} to SRTP_{FOO_H}..." -sed -i 's|\(# *\(ifdef\|ifndef\|define\|endif */\*\) *\)\([A-Z0-9_]*_H\)\($\| *\*/\)|\1SRTP_\3\4|' %buildroot/%_includedir/srtp2/*.h - %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig