bugfix for daily compile fail, sync upstream patch
This commit is contained in:
parent
24f6cac8fd
commit
7abd2a819b
32
bugfix-for-daily-compile-fail-sync-upstream-patch.patch
Normal file
32
bugfix-for-daily-compile-fail-sync-upstream-patch.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From d60bcb692907449d89b38464edb447c2710cffc2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: desert-sailor <dxwangk@isoftstone.com>
|
||||||
|
Date: Thu, 13 Apr 2023 17:09:53 +0800
|
||||||
|
Subject: [PATCH] bugfix for daily compile fail sync upstream patch
|
||||||
|
|
||||||
|
---
|
||||||
|
data/meson.build | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index bb61387..28d72a1 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -4,7 +4,6 @@ install_man('gedit.1')
|
||||||
|
|
||||||
|
appdata = 'org.gnome.gedit.appdata.xml'
|
||||||
|
appdata_file = i18n.merge_file(
|
||||||
|
- appdata,
|
||||||
|
input: appdata + '.in',
|
||||||
|
output: appdata,
|
||||||
|
po_dir: '../po/',
|
||||||
|
@@ -23,7 +22,6 @@ endif
|
||||||
|
|
||||||
|
desktop_file = 'org.gnome.gedit.desktop'
|
||||||
|
desktop_output_file = i18n.merge_file(
|
||||||
|
- desktop_file,
|
||||||
|
type: 'desktop',
|
||||||
|
input: desktop_file + '.in',
|
||||||
|
output: desktop_file,
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -4,12 +4,13 @@
|
|||||||
Name: gedit
|
Name: gedit
|
||||||
Version: 3.38.2
|
Version: 3.38.2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Text editor for the GNOME desktop
|
Summary: Text editor for the GNOME desktop
|
||||||
License: GPLv2+ and GFDL-1.1-or-later
|
License: GPLv2+ and GFDL-1.1-or-later
|
||||||
URL: https://wiki.gnome.org/Apps/Gedit
|
URL: https://wiki.gnome.org/Apps/Gedit
|
||||||
Source0: https://download.gnome.org/sources/gedit/3.38/gedit-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/gedit/3.38/gedit-%{version}.tar.xz
|
||||||
Patch1: python3-install-path-fix.patch
|
Patch1: python3-install-path-fix.patch
|
||||||
|
Patch2: bugfix-for-daily-compile-fail-sync-upstream-patch.patch
|
||||||
|
|
||||||
BuildRequires: gnome-common pkgconfig(glib-2.0) >= 2.64 pkgconfig(gtk+-3.0) >= 3.22.0
|
BuildRequires: gnome-common pkgconfig(glib-2.0) >= 2.64 pkgconfig(gtk+-3.0) >= 3.22.0
|
||||||
BuildRequires: pkgconfig(gobject-introspection-1.0) pkgconfig(gsettings-desktop-schemas)
|
BuildRequires: pkgconfig(gobject-introspection-1.0) pkgconfig(gsettings-desktop-schemas)
|
||||||
@ -98,6 +99,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 13 2023 Dongxing Wang <dxwangk@isoftstone.com> - 1:3.38.2-4
|
||||||
|
- fix daily compile fail, sync upstream patch
|
||||||
|
|
||||||
* Mon Jun 27 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1:3.38.2-3
|
* Mon Jun 27 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1:3.38.2-3
|
||||||
- add BuildRequires procps-ng
|
- add BuildRequires procps-ng
|
||||||
- modify add missing changelog in spec file by wenlong.ding@turbolinux.com.cn
|
- modify add missing changelog in spec file by wenlong.ding@turbolinux.com.cn
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user