diff --git a/xdg-desktop-portal-libpipewire_0_2.patch b/xdg-desktop-portal-libpipewire_0_2.patch new file mode 100644 index 0000000..51ac7b1 --- /dev/null +++ b/xdg-desktop-portal-libpipewire_0_2.patch @@ -0,0 +1,54 @@ +diff --git a/configure b/configure +index 921cce5..e292e2a 100755 +--- a/configure ++++ b/configure +@@ -15516,12 +15516,12 @@ if test -n "$PIPEWIRE_CFLAGS"; then + pkg_cv_PIPEWIRE_CFLAGS="$PIPEWIRE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpipewire-0.1 >= 0.1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libpipewire-0.1 >= 0.1.8") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpipewire-0.2 >= 0.2.2\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpipewire-0.2 >= 0.2.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_PIPEWIRE_CFLAGS=`$PKG_CONFIG --cflags "libpipewire-0.1 >= 0.1.8" 2>/dev/null` ++ pkg_cv_PIPEWIRE_CFLAGS=`$PKG_CONFIG --cflags "libpipewire-0.2 >= 0.2.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -15533,12 +15533,12 @@ if test -n "$PIPEWIRE_LIBS"; then + pkg_cv_PIPEWIRE_LIBS="$PIPEWIRE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpipewire-0.1 >= 0.1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libpipewire-0.1 >= 0.1.8") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpipewire-0.2 >= 0.2.2\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpipewire-0.2 >= 0.2.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_PIPEWIRE_LIBS=`$PKG_CONFIG --libs "libpipewire-0.1 >= 0.1.8" 2>/dev/null` ++ pkg_cv_PIPEWIRE_LIBS=`$PKG_CONFIG --libs "libpipewire-0.2 >= 0.2.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -15559,14 +15559,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PIPEWIRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpipewire-0.1 >= 0.1.8" 2>&1` ++ PIPEWIRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpipewire-0.2 >= 0.2.2" 2>&1` + else +- PIPEWIRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpipewire-0.1 >= 0.1.8" 2>&1` ++ PIPEWIRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpipewire-0.2 >= 0.2.2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PIPEWIRE_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (libpipewire-0.1 >= 0.1.8) were not met: ++ as_fn_error $? "Package requirements (libpipewire-0.2 >= 0.2.2) were not met: + + $PIPEWIRE_PKG_ERRORS + diff --git a/xdg-desktop-portal.spec b/xdg-desktop-portal.spec index d827b86..3a3dd77 100644 --- a/xdg-desktop-portal.spec +++ b/xdg-desktop-portal.spec @@ -1,17 +1,20 @@ Name: xdg-desktop-portal Version: 0.99 -Release: 1%{?dist} + +Release: 2%{?dist} Summary: Portal frontend service to flatpak License: LGPLv2+ URL: https://github.com/flatpak/xdg-desktop-portal/ Source0: https://github.com/flatpak/xdg-desktop-portal/releases/download/%{version}/%{name}-%{version}.tar.xz +Patch0: xdg-desktop-portal-libpipewire_0_2.patch + BuildRequires: gcc BuildRequires: pkgconfig(flatpak) BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(libpipewire-0.1) +BuildRequires: pkgconfig(libpipewire-0.2) BuildRequires: /usr/bin/xmlto %{?systemd_requires} BuildRequires: systemd @@ -38,6 +41,7 @@ The pkg-config file for %{name}. %prep %setup -q +%patch0 -p1 -b .libpipewire_0_2 %build %configure --enable-docbook-docs @@ -90,6 +94,15 @@ install -dm 755 %{buildroot}/%{_datadir}/%{name}/portals * Tue Jul 24 2018 David King - 0.99-1 - Update to 0.99 +* Wed Aug 01 2018 Jan Grulich - 0.99-2 +- Rebuild PipeWire 0.2.2 + +* Tue Jul 24 2018 David King - 0.99-1 +- Update to 0.99 + +* Sat Jul 14 2018 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 25 2018 David King - 0.11-1 - Update to 0.11 (#1545225)