Compare commits

...

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/xdg-desktop-portal-1.18.4.tar.xz SOURCES/xdg-desktop-portal-1.12.4.tar.xz

@ -1 +1 @@
febe475eedf04b035da0f5dcf22e5cc5c250aaaa SOURCES/xdg-desktop-portal-1.18.4.tar.xz 923952bd0a0e4cc2c6c5710b069ceca6c7c178de SOURCES/xdg-desktop-portal-1.12.4.tar.xz

@ -0,0 +1,26 @@
From 5b065233a76c642d0316d8f3143b0e63ca3b2d40 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 24 Aug 2021 16:38:18 +0200
Subject: [PATCH] Force power-profiles-daemon support in
---
src/power-profile-monitor.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/power-profile-monitor.c b/src/power-profile-monitor.c
index 9ffa87a51296..d033feded5e0 100644
--- a/src/power-profile-monitor.c
+++ b/src/power-profile-monitor.c
@@ -28,9 +28,7 @@
#include "xdp-dbus.h"
#include "xdp-utils.h"
-#if GLIB_CHECK_VERSION(2, 69, 1)
#define HAS_POWER_PROFILE_MONITOR 1
-#endif
typedef struct _PowerProfileMonitor PowerProfileMonitor;
typedef struct _PowerProfileMonitorClass PowerProfileMonitorClass;
--
2.34.1

@ -1,65 +1,42 @@
## START: Set by rpmautospec %global pipewire_version 0.2.90
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 4;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%global flatpak_version 1.5.0
%global geoclue_version 2.5.2 %global geoclue_version 2.5.2
%global glib_version 2.69.1 %global glib_version 2.68.3-5
%global low_memory_monitor_version 2.0 %global low_memory_monitor_version 2.0
%global pipewire_version 0.2.90
Name: xdg-desktop-portal Name: xdg-desktop-portal
Version: 1.18.4 Version: 1.12.4
Release: %autorelease Release: 1%{?dist}
Summary: Portal frontend service to flatpak Summary: Portal frontend service to flatpak
# doc/website is CC0-1.0 but it is not included in rpm License: LGPLv2+
License: LGPL-2.1-or-later
URL: https://github.com/flatpak/xdg-desktop-portal/ URL: https://github.com/flatpak/xdg-desktop-portal/
Source0: https://github.com/flatpak/xdg-desktop-portal/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/flatpak/xdg-desktop-portal/releases/download/%{version}/%{name}-%{version}.tar.xz
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext BuildRequires: make
BuildRequires: meson
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(flatpak) >= %{flatpak_version} BuildRequires: pkgconfig(flatpak)
BuildRequires: pkgconfig(fuse3) BuildRequires: pkgconfig(fuse)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib_version} BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib_version}
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version} BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version}
BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version} BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version}
BuildRequires: pkgconfig(libportal)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: python3-dbusmock
BuildRequires: python3-gobject-base
BuildRequires: python3-pytest
%if %{undefined rhel}
BuildRequires: python3-pytest-xdist
%endif
BuildRequires: /usr/bin/rst2man
BuildRequires: /usr/bin/xmlto BuildRequires: /usr/bin/xmlto
Requires: dbus Requires: dbus
# Required version for icon validator.
Recommends: flatpak >= 1.2.0
Requires: geoclue2 >= %{geoclue_version} Requires: geoclue2 >= %{geoclue_version}
Requires: glib2%{?_isa} >= %{glib_version} Requires: glib2%{?_isa} >= %{glib_version}
Recommends: pipewire >= %{pipewire_version} Recommends: pipewire >= %{pipewire_version}
Requires: pipewire-libs%{?_isa} >= %{pipewire_version} Requires: pipewire-libs%{?_isa} >= %{pipewire_version}
# Required for the document portal. # Required for the document portal.
Requires: fuse3 Requires: /usr/bin/fusermount
# Required for the GMemoryMonitor GIO API # Required for the GMemoryMonitor GIO API
Recommends: low-memory-monitor >= %{low_memory_monitor_version} Requires: low-memory-monitor >= %{low_memory_monitor_version}
# https://github.com/containers/composefs/pull/229#issuecomment-1838735764 # https://github.com/flatpak/xdg-desktop-portal/pull/613
%if 0%{?rhel} >= 10 Patch0: power-profiles-daemon-gnome-40-backport.patch
ExcludeArch: %{ix86}
%endif
%description %description
xdg-desktop-portal works by exposing a series of D-Bus interfaces known as xdg-desktop-portal works by exposing a series of D-Bus interfaces known as
@ -80,28 +57,28 @@ The pkg-config file for %{name}.
%build %build
%meson %configure --enable-docbook-docs --disable-libportal
%meson_build %make_build
%install %install
%meson_install %make_install
install -dm 755 %{buildroot}/%{_pkgdocdir} install -dm 755 %{buildroot}/%{_pkgdocdir}
install -pm 644 README.md %{buildroot}/%{_pkgdocdir} install -pm 644 README.md %{buildroot}/%{_pkgdocdir}
# This directory is used by implementations such as xdg-desktop-portal-gtk. # This directory is used by implementations such as xdg-desktop-portal-gtk.
install -dm 755 %{buildroot}/%{_datadir}/xdg-desktop-portal/portals install -dm 755 %{buildroot}/%{_datadir}/%{name}/portals
%find_lang %{name} %find_lang %{name}
%post %post
%systemd_user_post xdg-desktop-portal.service %systemd_user_post %{name}.service
%systemd_user_post xdg-document-portal.service %systemd_user_post xdg-document-portal.service
%systemd_user_post xdg-permission-store.service %systemd_user_post xdg-permission-store.service
%preun %preun
%systemd_user_preun xdg-desktop-portal.service %systemd_user_preun %{name}.service
%systemd_user_preun xdg-document-portal.service %systemd_user_preun xdg-document-portal.service
%systemd_user_preun xdg-permission-store.service %systemd_user_preun xdg-permission-store.service
@ -114,15 +91,11 @@ install -dm 755 %{buildroot}/%{_datadir}/xdg-desktop-portal/portals
%{_datadir}/dbus-1/services/org.freedesktop.portal.Desktop.service %{_datadir}/dbus-1/services/org.freedesktop.portal.Desktop.service
%{_datadir}/dbus-1/services/org.freedesktop.portal.Documents.service %{_datadir}/dbus-1/services/org.freedesktop.portal.Documents.service
%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.PermissionStore.service %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.PermissionStore.service
%{_datadir}/xdg-desktop-portal/ %{_datadir}/%{name}
%{_libexecdir}/xdg-desktop-portal %{_libexecdir}/xdg-desktop-portal
%{_libexecdir}/xdg-desktop-portal-rewrite-launchers
%{_libexecdir}/xdg-desktop-portal-validate-icon
%{_libexecdir}/xdg-document-portal %{_libexecdir}/xdg-document-portal
%{_libexecdir}/xdg-permission-store %{_libexecdir}/xdg-permission-store
%{_mandir}/man5/portals.conf.5* %{_userunitdir}/%{name}.service
%{_userunitdir}/xdg-desktop-portal.service
%{_userunitdir}/xdg-desktop-portal-rewrite-launchers.service
%{_userunitdir}/xdg-document-portal.service %{_userunitdir}/xdg-document-portal.service
%{_userunitdir}/xdg-permission-store.service %{_userunitdir}/xdg-permission-store.service
@ -131,141 +104,38 @@ install -dm 755 %{buildroot}/%{_datadir}/xdg-desktop-portal/portals
%changelog %changelog
## START: Generated by rpmautospec * Wed Apr 20 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.4-1
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.18.4-4
- Bump release for October 2024 mass rebuild:
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.18.4-3
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.18.4-3
- Bump release for June 2024 mass rebuild
* Thu May 09 2024 Tomas Pelka <tpelka@redhat.com> - 1.18.4-2
- Add gating.yaml via API
* Wed Apr 24 2024 Jan Grulich <jgrulich@redhat.com> - 1.18.4-1
- Update to 1.18.4
* Tue Feb 06 2024 Miroslav Suchý <msuchy@redhat.com> - 1.18.2-5
- Migrate to SPDX license
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 15 2024 Colin Walters <walters@verbum.org> - 1.18.2-3
- Scope ExcludeArch: ix86 to rhel10+
* Tue Dec 26 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.18.2-2
- https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
* Wed Nov 22 2023 Kalev Lember <klember@redhat.com> - 1.18.2-1
- Update to 1.18.2
* Sat Nov 18 2023 Pete Walter <pwalter@fedoraproject.org> - 1.18.1-3
- Require fuse3 instead of /usr/bin/fusermount3
* Tue Nov 14 2023 Debarshi Ray <debarshir@gnome.org> - 1.18.1-2
- Specify the minimum BuildRequires for pkgconfig(flatpak)
* Thu Oct 26 2023 Kalev Lember <klember@redhat.com> - 1.18.1-1
- Update to 1.18.1
* Fri Oct 06 2023 Jan Grulich <jgrulich@redhat.com> - 1.18.0-3
- Upstream backport: delete transient permissions when peer dies
* Tue Sep 26 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 1.18.0-2
- Change dependency on low-memory-monitor to Recommends
* Tue Sep 19 2023 Kalev Lember <klember@redhat.com> - 1.18.0-1
- Update to 1.18.0
* Thu Sep 14 2023 Kalev Lember <klember@redhat.com> - 1.17.2-1
- Update to 1.17.2
* Fri Aug 25 2023 Kalev Lember <klember@redhat.com> - 1.17.0-3
- Package portals.conf man page
* Wed Aug 09 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.17.0-2
- Skip python-pytest-xdist in RHEL builds
* Sat Aug 05 2023 Kalev Lember <klember@redhat.com> - 1.17.0-1
- Update to 1.17.0
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Apr 10 2023 Adam Williamson <awilliam@redhat.com> - 1.16.0-3
- Backport MR #985 to help with apps launching slow on KDE (#2176759)
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Dec 15 2022 David King <amigadave@amigadave.com> - 1.16.0-1
- Update to 1.16.0 (#2152793)
* Sat Nov 26 2022 David King <amigadave@amigadave.com> - 1.15.0-4
- Update fusermount dependency (#2142385)
* Sat Oct 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 1.15.0-3
- Remove Recommends: flatpak
* Fri Aug 12 2022 Kalev Lember <klember@redhat.com> - 1.15.0-1
- Update to 1.15.0
* Tue Aug 02 2022 Kalev Lember <klember@redhat.com> - 1.14.6-1
- Update to 1.14.6
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jul 20 2022 Kalev Lember <klember@redhat.com> - 1.14.5-1
- Update to 1.14.5
* Thu May 05 2022 David King <amigadave@amigadave.com> - 1.14.4-1
- Update to 1.14.4 (#2065842)
* Sat Apr 16 2022 David King <amigadave@amigadave.com> - 1.14.3-1
- Update to 1.14.3 (#2065842)
* Sat Apr 16 2022 David King <amigadave@amigadave.com> - 1.12.4-1
- Update to 1.12.4 - Update to 1.12.4
Resolves: #2068448, #2076812
* Tue Apr 05 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.3-2 * Mon Apr 04 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.3-1
- Fix the GLib dependency
* Mon Mar 28 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.3-1
- Update to 1.12.3 - Update to 1.12.3
Resolves: #2068448, #2069328
* Fri Mar 25 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.2-2
- Explicit library Requires should be arch-specific
* Fri Mar 25 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.2-1 * Fri Mar 25 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.2-1
- Update to 1.12.2 - Update to 1.12.2
- Explicit library Requires should be arch-specific
Resolves: #2068448
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2 * Tue Feb 08 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.12.1-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebase to 1.12.1
Resolves: #2051488
* Thu Dec 23 2021 David King <amigadave@amigadave.com> - 1.12.1-1
- Update to 1.12.1
* Tue Dec 21 2021 David King <amigadave@amigadave.com> - 1.12.0-1
- Update to 1.12.0
* Tue Nov 09 2021 Aleksei Bavshin <alebastr@fedoraproject.org> - 1.10.1-2
- Add patch for org.freedesktop.FileManager1 deadlock (#2020371)
* Mon Sep 20 2021 David King <amigadave@amigadave.com> - 1.10.1-1 * Tue Aug 24 2021 Bastien Nocera <bnocera@redhat.com> - 1.8.1-6
- Update to 1.10.1 (#2006126) + xdg-desktop-portal-1.8.1-6
- Add PowerProfileMonitor portal
- Resolves: rhbz#1994468
* Thu Sep 16 2021 David King <amigadave@amigadave.com> - 1.10.0-1 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.1-5
- Update to 1.10.0 (#2004782) - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-4 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Apr 15 2021 Tomas Popela <tpopela@redhat.com> - 1.8.1-3 * Thu Apr 15 2021 Tomas Popela <tpopela@redhat.com> - 1.8.1-3
- Drop PipeWire 0.2 requirement as Chrom[e|ium] 90 now depends on PipeWire 0.3 - Drop PipeWire 0.2 requirement as Chrom[e|ium] 90 now depends on PipeWire 0.3
- Resolves: rhbz#1929237
* Wed Feb 17 2021 David King <amigadave@amigadave.com> - 1.8.1-2 * Wed Feb 17 2021 David King <amigadave@amigadave.com> - 1.8.1-2
- Drop unused fontconfig BuildRequires - Drop unused fontconfig BuildRequires
@ -405,5 +275,3 @@ install -dm 755 %{buildroot}/%{_datadir}/xdg-desktop-portal/portals
* Mon Jul 11 2016 David King <amigadave@amigadave.com> - 0.1-1 * Mon Jul 11 2016 David King <amigadave@amigadave.com> - 0.1-1
- Initial Fedora packaging - Initial Fedora packaging
## END: Generated by rpmautospec

Loading…
Cancel
Save