diff --git a/pkgdir.patch b/pkgdir.patch new file mode 100644 index 0000000..c4c8f70 --- /dev/null +++ b/pkgdir.patch @@ -0,0 +1,12 @@ +diff -ru roc-toolkit-0.2.1/src/SConscript roc-toolkit-0.2.1.new/src/SConscript +--- roc-toolkit-0.2.1/src/SConscript 2022-12-26 12:02:40.000000000 +0100 ++++ roc-toolkit-0.2.1.new/src/SConscript 2023-01-10 10:14:45.212536410 +0100 +@@ -141,7 +141,7 @@ + desc='Real-time audio streaming over the network.', + url='https://roc-streaming.org', + version=env['ROC_VERSION']) +- env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file) ++ env.AddDistFile(env['ROC_SYSTEM_LIBDIR'] + '/pkgconfig', pc_file) + + if GetOption('enable_examples'): + examples_env = subenvs.examples.Clone() diff --git a/roc-toolkit.spec b/roc-toolkit.spec index a0576fb..6923958 100644 --- a/roc-toolkit.spec +++ b/roc-toolkit.spec @@ -1,18 +1,19 @@ # git ls-remote https://github.com/roc-streaming/roc-toolkit.git -%global git_commit 2017450a058eacb364c3a87620a32395e46a6e47 -%global git_date 20221224 +#global git_commit 127cfc645d0a807a33506001367b6d9a9d46f23e +#global git_date 20230110 -%global git_short_commit %(echo %{git_commit} | cut -c -8) -%global git_suffix %{git_date}git%{git_short_commit} +#global git_short_commit %(echo %{git_commit} | cut -c -8) +#global git_suffix %{git_date}git%{git_short_commit} Name: roc-toolkit -Version: 0.1.5^%{git_suffix} +#Version: 0.2.1^%{git_suffix} +Version: 0.2.1 Release: 1%{?dist} Summary: Real-time audio streaming License: MPL-2.0 AND LGPL-2.1-or-later AND CECILL-C URL: https://github.com/roc-streaming/roc-toolkit -#Source0: %%{URL}/archive/v%%{version}/%%{name}-%%{version}.tar.gz -Source0: %{url}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz +#Source0: %{url}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: python3-devel @@ -35,6 +36,7 @@ BuildRequires: speexdsp-devel BuildRequires: doxygen # https://github.com/roc-streaming/roc-toolkit/issues/481 Patch0: roc-toolkit-0.1.5-no-explicit-cpp98.patch +Patch1: pkgdir.patch %description Roc is a toolkit for real-time audio streaming over the network. @@ -61,7 +63,8 @@ Summary: Documentation for roc-toolkit Documentation for roc-toolkit. %prep -%autosetup -p1 -n %{name}-%{git_commit} +#autosetup -p1 -n %{name}-%{git_commit} +%autosetup -p1 -n %{name}-%{version} %build scons %{?_smp_mflags} --with-openfec-includes=%{_includedir}/openfec \ @@ -83,6 +86,7 @@ scons test --with-openfec-includes=%{_includedir}/openfec --enable-tests %files devel %{_includedir}/roc %{_libdir}/libroc.so +%{_libdir}/pkgconfig/roc.pc %files utils %{_bindir}/roc-conv @@ -94,6 +98,9 @@ scons test --with-openfec-includes=%{_includedir}/openfec --enable-tests %doc docs/html %changelog +* Tue Jan 10 2023 Wim Taymans - 0.2.1-1 +- Update to 0.2.1 + * Sat Dec 24 2022 Jaroslav Škarvada - 0.1.5^20221224git2017450a-1 - New snapshot diff --git a/sources b/sources index 2eefb6c..a9f0bb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (roc-toolkit-20221224git2017450a.tar.gz) = 788a966b04c3a10e6de7978253213c6ce2985abca3dc8a6d52f2079ed3531041ea44f0ff822279ceb8f04b40153089d29371f0f6038ff67a454319dea584f651 +SHA512 (roc-toolkit-0.2.1.tar.gz) = 482d11d35bdb2b298f368d4d0c2c223f48a166c57880c0d19df503923ec36a1515ed2d32d110966ceb0de4771584adf2ccb50a1ae5fbe9e5c47c42d17d9cc37c