From 80b93a9bf8b1b9ba1d1b019606588346abe1f1df Mon Sep 17 00:00:00 2001 From: releng bot Date: Thu, 16 Feb 2023 02:58:35 +0000 Subject: [PATCH 1/4] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..212e226 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# librist + +The librist package From 480b24397b892544b9da13e3b915d020d855b600 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 15 Feb 2023 22:01:02 -0500 Subject: [PATCH 2/4] Initial package --- .gitignore | 1 + ...ld-fix-reference-to-libcjson-pc-file.patch | 28 +++++ librist.spec | 102 ++++++++++++++++++ sources | 1 + 4 files changed, 132 insertions(+) create mode 100644 .gitignore create mode 100644 0001-meson.build-fix-reference-to-libcjson-pc-file.patch create mode 100644 librist.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..81c052a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/librist-v0.2.7.tar.gz diff --git a/0001-meson.build-fix-reference-to-libcjson-pc-file.patch b/0001-meson.build-fix-reference-to-libcjson-pc-file.patch new file mode 100644 index 0000000..7e27135 --- /dev/null +++ b/0001-meson.build-fix-reference-to-libcjson-pc-file.patch @@ -0,0 +1,28 @@ +From 809390b3b75a259a704079d0fb4d8f1b5f7fa956 Mon Sep 17 00:00:00 2001 +From: Alexandre Janniaux +Date: Fri, 8 Apr 2022 11:08:39 +0200 +Subject: [PATCH] meson.build: fix reference to libcjson pc file + +Debian is using cJSON from github.com/DaveGamble/cJSON, as well as +archlinux and homebrew, which is shipping a libcjson.pc file. Only +ubuntu is using a different version not including the .pc file. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a777806..0ed8201 100755 +--- a/meson.build ++++ b/meson.build +@@ -156,7 +156,7 @@ endif + + #On ubuntu cjson does not come with pkgconfig files, hence the extended checking. + if not builtin_cjson +- cjson_lib = dependency('cJSON', required: false) ++ cjson_lib = dependency('libcjson', required: false) + if not cjson_lib.found() + cjson_lib = cc.find_library('cjson', required: required_library, has_headers: ['cjson/cJSON.h']) + if not cjson_lib.found() +-- +2.38.1 + diff --git a/librist.spec b/librist.spec new file mode 100644 index 0000000..d3f0b8d --- /dev/null +++ b/librist.spec @@ -0,0 +1,102 @@ +%global somajor 4 + +Name: librist +Version: 0.2.7 +Release: 1%{?dist} +Summary: Library for Reliable Internet Stream Transport (RIST) protocol + +# Everything used is BSD-2-Clause except getopt-shim, which is ISC as well +License: BSD-2-Clause and ISC +URL: https://code.videolan.org/rist/librist +Source0: %{url}/-/archive/v%{version}/librist-v%{version}.tar.gz + +# Backport from upstream +## From: https://code.videolan.org/rist/librist/-/commit/809390b3b75a259a704079d0fb4d8f1b5f7fa956 +Patch0001: 0001-meson.build-fix-reference-to-libcjson-pc-file.patch + +BuildRequires: gcc +BuildRequires: meson +BuildRequires: ninja-build +BuildRequires: libcmocka-devel +BuildRequires: mbedtls-devel +BuildRequires: pkgconfig(libcjson) + +%description +A library that can be used to speak the RIST protocol (as defined by Video +Services Forum (VSF) Technical Recommendations TR-06-1 and TR-06-2). + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package doc +Summary: Technical documentation for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc package contains technical documentation for +developing applications that use %{name}. + + +%package -n rist-tools +Summary: User tools for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n rist-tools +This package contains the user tools for the RIST protocol library. + + +%prep +%autosetup -n %{name}-v%{version} -p1 + + +%build +%meson +%meson_build + + +%install +%meson_install +# Strip unwanted executable bits +chmod -x %{buildroot}%{_includedir}/%{name}/*.h +chmod -x docs/* + +# Install documentation +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -av docs/* %{buildroot}%{_docdir}/%{name} + + +%check +%meson_test + + +%files +%doc README.md CONTRIBUTING.md +%license COPYING +%{_libdir}/*.so.%{somajor}{,.*} + +%files devel +%{_includedir}/%{name}/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc + +%files doc +%license COPYING +# Co-own with librist package +%dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/VSF_TR-06-1.pdf +%doc %{_docdir}/%{name}/VSF_TR-06-2.pdf +%doc %{_docdir}/%{name}/librist_logo.png + +%files -n rist-tools +%{_bindir}/rist* + + +%changelog +* Wed Feb 15 2023 Neal Gompa - 0.2.7-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..c01fe9c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (librist-v0.2.7.tar.gz) = fa4e1aea75206781d062d350410e2f4e095e52191d22fb1882ec779ca13845294d00b5e4f06f04573eb8945ec280c304c96c1607622e978a241c5086b7d0a831 From 2a717a25d798cf837cbf2e118b88c289ad6d2d96 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 15 Feb 2023 22:19:52 -0500 Subject: [PATCH 3/4] Tests are flaky in Koji, disable for now --- librist.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/librist.spec b/librist.spec index d3f0b8d..89300e2 100644 --- a/librist.spec +++ b/librist.spec @@ -1,5 +1,8 @@ %global somajor 4 +# Tests are flaky in Koji +%bcond_with tests + Name: librist Version: 0.2.7 Release: 1%{?dist} @@ -71,8 +74,10 @@ mkdir -p %{buildroot}%{_docdir}/%{name} cp -av docs/* %{buildroot}%{_docdir}/%{name} +%if %{with tests} %check %meson_test +%endif %files From 2122d3489a86dd8ff0fe95cb0ed169cb9223306d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:15:15 +0300 Subject: [PATCH 4/4] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 212e226..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# librist - -The librist package diff --git a/sources b/sources deleted file mode 100644 index c01fe9c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (librist-v0.2.7.tar.gz) = fa4e1aea75206781d062d350410e2f4e095e52191d22fb1882ec779ca13845294d00b5e4f06f04573eb8945ec280c304c96c1607622e978a241c5086b7d0a831