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
This commit is contained in:
DistroBaker 2021-04-03 06:50:14 +00:00
parent f812dd2228
commit e8c7a8dadf
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From a03d70b6fb886e7c7e44775562826377fe073c27 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
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 @@
<translation type="gettext">gedit</translation>
<content_rating type="oars-1.1" />
<releases>
+ <release version="40.0" date="2021-03-19" />
<release version="3.38.0" date="2020-09-11" />
<release version="3.37.92" date="2020-09-04" />
<release version="3.37.3" date="2020-07-03" />
--
2.30.2

View File

@ -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 <klember@redhat.com> - 2:40.0-3
- Add 40.0 release info to appdata
* Wed Mar 24 2021 Kalev Lember <klember@redhat.com> - 2:40.0-2
- Filter provides for plugin .so files