From 056c6d80941b2d551093fab7c0c6459360c7dcf4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 8 Feb 2022 20:10:14 +0100 Subject: [PATCH] Remove an obsolete Fedora-specific update path --- flatpak.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/flatpak.spec b/flatpak.spec index 532d28f..cbea447 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -3,7 +3,7 @@ Name: flatpak Version: 1.12.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ @@ -45,10 +45,6 @@ BuildRequires: /usr/bin/xdg-dbus-proxy BuildRequires: /usr/bin/xmlto BuildRequires: /usr/bin/xsltproc -%if 0%{?fedora} -%{?systemd_requires} -%endif - Requires: bubblewrap >= %{bubblewrap_version} Requires: librsvg2%{?_isa} Requires: ostree-libs%{?_isa} >= %{ostree_version} @@ -168,14 +164,6 @@ exit 0 %if 0%{?fedora} %post %systemd_post flatpak-add-fedora-repos.service - -if [ $1 -gt 1 ] ; then - # Apply the preset also on package updates to support F29->F31 upgrade - # path. systemd_post macro only handles initial installs and not the - # case when a new .service file appears on a package update. - # Should be fine to drop in F32. - systemctl --no-reload preset flatpak-add-fedora-repos.service >/dev/null 2>&1 || : -fi %endif @@ -275,6 +263,10 @@ fi %changelog +* Tue Feb 08 2022 Debarshi Ray - 1.12.4-2 +- Don't try to add Fedora's OCI Flatpak repository on RHEL +- Remove an obsolete Fedora-specific update path + * Thu Jan 20 2022 Fedora Release Engineering - 1.12.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild