!2 rebuild and sovle compile error

From: @tanyulong2021 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-07-18 01:38:36 +00:00 committed by Gitee
commit 42b41a6d87
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 14 deletions

View File

@ -1,16 +1,28 @@
diff -Naur glade3-a/help/Makefile.am glade3-3.8.6/help/Makefile.am From 5323e4ffca4feb91ce8bf3798e3ca0fce78f83e2 Mon Sep 17 00:00:00 2001
--- glade3-a/help/Makefile.am 2019-11-25 22:26:48.737052503 -0500 From: tanyulong2021 <tanyulong@kylinos.cn>
+++ glade3-3.8.6/help/Makefile.am 2019-11-25 22:27:18.261566436 -0500 Date: Mon, 13 Jun 2022 15:18:24 +0800
@@ -9,4 +9,4 @@ Subject: [PATCH] glade3 delete bg uk po
---
help/Makefile.am | 2 +-
help/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/help/Makefile.am b/help/Makefile.am
index db5a323..20b7509 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -9,4 +9,4 @@ HELP_FILES = \
HELP_MEDIA = figures/main-window.png HELP_MEDIA = figures/main-window.png
-HELP_LINGUAS = bg cs de el en_GB es eu fr hi it ja oc pt_BR ru sl sv uk zh_CN -HELP_LINGUAS = bg cs de el en_GB es eu fr hi it ja oc pt_BR ru sl sv uk zh_CN
+HELP_LINGUAS = cs de el en_GB es eu fr hi it ja oc pt_BR ru sl sv zh_CN +HELP_LINGUAS = cs de el en_GB es eu fr hi it ja oc pt_BR ru sl sv zh_CN
diff -Naur glade3-a/help/Makefile.in glade3-3.8.6/help/Makefile.in diff --git a/help/Makefile.in b/help/Makefile.in
--- glade3-a/help/Makefile.in 2019-11-25 22:26:48.737052503 -0500 index fb4a114..c9a011b 100644
+++ glade3-3.8.6/help/Makefile.in 2019-11-25 22:27:46.958065957 -0500 --- a/help/Makefile.in
@@ -336,7 +336,7 @@ +++ b/help/Makefile.in
@@ -336,7 +336,7 @@ HELP_FILES = \
$(NULL) $(NULL)
HELP_MEDIA = figures/main-window.png HELP_MEDIA = figures/main-window.png
@ -19,3 +31,6 @@ diff -Naur glade3-a/help/Makefile.in glade3-3.8.6/help/Makefile.in
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
--
2.33.0

View File

@ -1,7 +1,7 @@
Name: glade3 Name: glade3
Epoch: 2 Epoch: 2
Version: 3.8.6 Version: 3.8.6
Release: 6%{?dist} Release: 7
Summary: User Interface Designer for GTK+ 2 Summary: User Interface Designer for GTK+ 2
License: GPLv2+ License: GPLv2+
@ -18,8 +18,6 @@ BuildRequires: intltool
BuildRequires: itstool BuildRequires: itstool
BuildRequires: libgnomeui-devel BuildRequires: libgnomeui-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: pygtk2-devel
BuildRequires: python2-devel
BuildRequires: chrpath BuildRequires: chrpath
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
@ -30,7 +28,7 @@ Glade is a RAD tool to enable quick and easy development of user interfaces for
the GTK+ 2 toolkit and the GNOME desktop environment. the GTK+ 2 toolkit and the GNOME desktop environment.
The user interfaces designed in Glade are saved as XML, which can be used in The user interfaces designed in Glade are saved as XML, which can be used in
numerous programming languages including C, C++, Java, Perl, Python, C#, Pike, numerous programming languages including C, C++, Java, Perl, C#, Pike,
Ruby, Haskell, Objective Caml and Scheme. Adding support for other languages Ruby, Haskell, Objective Caml and Scheme. Adding support for other languages
is easy too. is easy too.
@ -116,7 +114,7 @@ UpstreamURL: https://git.gnome.org/browse/glade/plain/data/glade.appdata.xml.in
The user interfaces designed in Glade are saved as XML, and can be loaded The user interfaces designed in Glade are saved as XML, and can be loaded
dynamically into applications by using GtkBuilder. dynamically into applications by using GtkBuilder.
Those files can be used in many programming languages including C, C++, C#, Vala, Those files can be used in many programming languages including C, C++, C#, Vala,
Java, Perl, Python, and others. Java, Perl, and others.
Glade's ability to connect widget signals with corresponding functions makes the Glade's ability to connect widget signals with corresponding functions makes the
integration of user interfaces into code even simpler. integration of user interfaces into code even simpler.
</p> </p>
@ -138,7 +136,7 @@ EOF
# Rpath # Rpath
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladegnome.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladegnome.so
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladegtk.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladegtk.so
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladepython.so #chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladepython.so
%check %check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop
@ -191,6 +189,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop
%{_includedir}/libgladeui-1.0/gladeui %{_includedir}/libgladeui-1.0/gladeui
%changelog %changelog
* Mon Jun 13 2022 tanyulong <tanyulong@kylinos.cn> - 2:3.8.6-7
- rebuild and solve compile error
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.8.6-6 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.8.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild