Compare commits

..

3 commits

Author SHA1 Message Date
Kalev Lember
1e784a5d9d Fix ref mixup in previous commit 2020-10-20 17:14:22 +02:00
Kalev Lember
cc854ba7a1 Use last ref for meld package that still has org.gnome.meld 2020-10-20 16:34:47 +02:00
Kalev Lember
7c21b986eb 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.
2020-10-20 16:00:08 +02:00
2 changed files with 45 additions and 6 deletions

View file

@ -1,5 +1,10 @@
compose:
modules:
- meld:f32
flatpak:
id: org.gnome.Meld
id: org.gnome.meld
name: eol/meld
end-of-life-rebase: org.gnome.Meld
branch: stable
command: meld
finish-args: |-
@ -9,8 +14,3 @@ flatpak:
--socket=wayland
--filesystem=host
--metadata=X-DConf=migrate-path=/org/gnome/meld/
runtime-name: flatpak-runtime
runtime-version: f44
packages:
- meld
- git-core

39
meld.yaml Normal file
View file

@ -0,0 +1,39 @@
---
document: modulemd
version: 2
data:
summary: Visual diff and merge tool
description: >-
Meld is a visual diff and merge tool targeted at developers. It helps you compare
files, directories, and version controlled projects. It provides two- and three-way
comparison of both files and directories, and the tabbed interface allows you
to open many diffs at once. Meld has has support for many popular version control
systems including Git, Mercurial, Bazaar, SVN and CVS. The diff viewer lets you
edit files in place (diffs update dynamically), and a middle column shows detailed
changes and allows merges. The margins show location of changes for easy navigation.
license:
module:
- MIT
dependencies:
- buildrequires:
flatpak-common: [f32]
flatpak-runtime: [f32]
platform: [f32]
requires:
flatpak-common: [f32]
flatpak-runtime: [f32]
platform: [f32]
profiles:
default:
rpms:
- meld
components:
rpms:
meld:
rationale: Application package
ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7
buildorder: 10
patch:
rationale: Runtime dependency
ref: f32
...