From 1407734ef3c7a0604805420c63596b5866e01abc Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 22 Jan 2021 00:02:21 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/pipewire.git#1367d7a35b1ff36cea8f232e65ee88ea8f65e376 --- .gitignore | 1 + pipewire.spec | 16 +++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cdebe09..9405ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /pipewire-0.3.17.tar.gz /pipewire-0.3.18.tar.gz /pipewire-0.3.19.tar.gz +/pipewire-0.3.20.tar.gz diff --git a/pipewire.spec b/pipewire.spec index c337a9c..e77051f 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,6 +1,6 @@ %global majorversion 0 %global minorversion 3 -%global microversion 19 +%global microversion 20 %global apiversion 0.3 %global spaversion 0.2 @@ -8,7 +8,7 @@ %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 # For rpmdev-bumpspec and releng automation -%global baserelease 4 +%global baserelease 1 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -57,6 +57,7 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/p ## fedora patches +BuildRequires: gettext BuildRequires: meson >= 0.49.0 BuildRequires: gcc BuildRequires: pkgconfig @@ -245,6 +246,8 @@ rm %{buildroot}%{_userunitdir}/pipewire-pulse.* rm -rf %{buildroot}%{_sysconfdir}/pipewire/media-session.d/with-pulseaudio %endif +%find_lang %{name} + # upstream should use udev.pc mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d mv -fv %{buildroot}/lib/udev/rules.d/90-pipewire-alsa.rules %{buildroot}%{_prefix}/lib/udev/rules.d @@ -294,10 +297,12 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %dir %{_sysconfdir}/pipewire/media-session.d/ %config(noreplace) %{_sysconfdir}/pipewire/pipewire.conf %config(noreplace) %{_sysconfdir}/pipewire/media-session.d/alsa-monitor.conf +%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/bluez-monitor.conf %config(noreplace) %{_sysconfdir}/pipewire/media-session.d/media-session.conf +%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/v4l2-monitor.conf %{_mandir}/man5/pipewire.conf.5* -%files libs +%files libs -f %{name}.lang %license LICENSE COPYING %doc README.md %{_libdir}/libpipewire-%{apiversion}.so.* @@ -394,6 +399,11 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Wed Jan 20 2021 Wim Taymans - 0.3.20-1 +- Update to 0.3.20 +- Fix baseversion +- Add gettext dependency + * Tue Jan 12 2021 Neal Gompa - 0.3.19-4 - Rework conditional build to fix ELN builds diff --git a/sources b/sources index 7c800e5..63c1406 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pipewire-0.3.19.tar.gz) = 7e720be2055e86960b2ab8685e61072097581ed0e96346535c039e3124830e5f1b4d9cfd7ec827c104f3e99bdfa5e23a01f224a7b2fdb4048bc6ec755e550daf +SHA512 (pipewire-0.3.20.tar.gz) = 7838cafe413e5082146e39a8d2cd29ec5193da68fa76c4d2b9390cbdf06d388c5a8b76f90fadf5f7ece4a8b1b86c3765b3fa968479f3bb9e11e84be006276c1c