!19 fix issue:【OBS】gedit build problem in openEuler:22.03:LTS:Next:Epol

From: @desert-sailor 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2023-04-14 07:46:58 +00:00 committed by Gitee
commit 81021a9775
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 1 deletions

View 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

View File

@ -4,12 +4,13 @@
Name: gedit
Version: 3.38.2
Epoch: 1
Release: 3
Release: 4
Summary: Text editor for the GNOME desktop
License: GPLv2+ and GFDL-1.1-or-later
URL: https://wiki.gnome.org/Apps/Gedit
Source0: https://download.gnome.org/sources/gedit/3.38/gedit-%{version}.tar.xz
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: 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/*
%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
- add BuildRequires procps-ng
- modify add missing changelog in spec file by wenlong.ding@turbolinux.com.cn