From e8c7a8dadf8ba4ff7ba4e9ba43d6d38d3d20a60d Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 3 Apr 2021 06:50:14 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gedit.git#79f01ac3ba139cfa3cde145e6fe53dd3e373e9f3 --- 0001-Add-40.0-release-info-to-appdata.patch | 24 +++++++++++++++++++++ gedit.spec | 7 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-Add-40.0-release-info-to-appdata.patch diff --git a/0001-Add-40.0-release-info-to-appdata.patch b/0001-Add-40.0-release-info-to-appdata.patch new file mode 100644 index 0000000..a9f5961 --- /dev/null +++ b/0001-Add-40.0-release-info-to-appdata.patch @@ -0,0 +1,24 @@ +From a03d70b6fb886e7c7e44775562826377fe073c27 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Fri, 2 Apr 2021 13:45:37 +0200 +Subject: [PATCH] Add 40.0 release info to appdata + +--- + data/org.gnome.gedit.appdata.xml.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/org.gnome.gedit.appdata.xml.in b/data/org.gnome.gedit.appdata.xml.in +index 5bf14503c..c5d3bdc94 100644 +--- a/data/org.gnome.gedit.appdata.xml.in ++++ b/data/org.gnome.gedit.appdata.xml.in +@@ -36,6 +36,7 @@ + gedit + + ++ + + + +-- +2.30.2 + diff --git a/gedit.spec b/gedit.spec index 748bd8f..dadc847 100644 --- a/gedit.spec +++ b/gedit.spec @@ -16,7 +16,7 @@ Name: gedit Epoch: 2 Version: 40.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Text editor for the GNOME desktop License: GPLv2+ and GFDL @@ -28,6 +28,8 @@ Patch1: restore-overlay-scrollbars.patch # Override meson default change so Gedit.py installs to %%{python3_sitearch} # as expected (instead of %%{python3_sitelib}) Patch2: python3-install-path-fix.patch +# https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/108 +Patch3: 0001-Add-40.0-release-info-to-appdata.patch BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -174,6 +176,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de %{_datadir}/vala/ %changelog +* Fri Apr 02 2021 Kalev Lember - 2:40.0-3 +- Add 40.0 release info to appdata + * Wed Mar 24 2021 Kalev Lember - 2:40.0-2 - Filter provides for plugin .so files