From 7c21b986ebc8f17c60b686f4899bbb4cb10c39ce Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 20 Oct 2020 15:58:56 +0200
Subject: [PATCH 1/3] end-of-life-rebase: org.gnome.Meld

In F33 flatpak builds, meld is now org.gnome.Meld instead of org.gnome.meld.

To make flatpak updates seamlessly work, this commit adds
'end-of-life-rebase: org.gnome.Meld' to org.gnome.meld to get all users
migrated over to the new ID.
---
 container.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/container.yaml b/container.yaml
index 94e13f8..edfbd48 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,8 +1,10 @@
 compose:
     modules:
-    - meld:master
+    - meld:f32
 flatpak:
     id: org.gnome.meld
+    name: eol/meld
+    end-of-life-rebase: org.gnome.Meld
     branch: stable
     command: meld
     finish-args: |-

From cc854ba7a13e7912c2d11a79aacff3769c0486e7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 20 Oct 2020 16:34:16 +0200
Subject: [PATCH 2/3] Use last ref for meld package that still has
 org.gnome.meld

---
 meld.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld.yaml b/meld.yaml
index ac7168f..6a3cb55 100644
--- a/meld.yaml
+++ b/meld.yaml
@@ -35,5 +35,5 @@ data:
         buildorder: 10
       patch:
         rationale: Runtime dependency
-        ref: f32
+        ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7
 ...

From 1e784a5d9dba070e6b40d328dde7312319d3ccf1 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 20 Oct 2020 17:14:22 +0200
Subject: [PATCH 3/3] Fix ref mixup in previous commit

---
 meld.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meld.yaml b/meld.yaml
index 6a3cb55..d4e2471 100644
--- a/meld.yaml
+++ b/meld.yaml
@@ -31,9 +31,9 @@ data:
     rpms:
       meld:
         rationale: Application package
-        ref: f32
+        ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7
         buildorder: 10
       patch:
         rationale: Runtime dependency
-        ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7
+        ref: f32
 ...