Compare commits

..

No commits in common. "81021a9775ccc7772a77dd63e834954e7d3e1a74" and "cee904024e695e67cf91de42b9256f6b7ec687af" have entirely different histories.

5 changed files with 0 additions and 166 deletions

View File

@ -1,32 +0,0 @@
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

Binary file not shown.

View File

@ -1,118 +0,0 @@
%global __python %{__python3}
%global apiver 3.38
Name: gedit
Version: 3.38.2
Epoch: 1
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)
BuildRequires: pkgconfig(gspell-1) >= 1.0 python3-devel python3-gobject >= 3.0.0
BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.2 pkgconfig(iso-codes) itstool vala meson
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.14.1 pkgconfig(libxml-2.0) intltool yelp-tools
BuildRequires: pkgconfig(pygobject-3.0) desktop-file-utils gettext which /usr/bin/appstream-util
BuildRequires: pkgconfig(libsoup-2.4) pkgconfig(tepl-5) >= 4.99.2 gtk-doc procps-ng
Requires: glib2 >= 2.64 gspell >= 1.0 gtk3 >= 3.22.0 gtksourceview4 >= 4.0.2
Requires: libpeas-loader-python3 python3-gobject >= 3.0.0 zenity tepl >= 4.99.2
Requires: gsettings-desktop-schemas gvfs desktop-file-utils >= 0.22-6
Obsoletes: gedit-collaboration < 3.6.1-6
%description
gedit is a powerful small text editor dedicated to the GNOME desktop.
gedit supports unicode encoding, has most standard text editor functions,
can support syntax highlighting and automatic source code indentation,
printing and editing of multiple documents in one window.
gedit can extend the system through plug-ins, including spelling,
file comparison, and viewing CVS logs, and adjusting indentation levels.
%package devel
Summary: Support for developing plugins for the gedit text editor
Requires: gedit = %{epoch}:%{version}-%{release}
%description devel
gedit is a small, but powerful text editor for the GNOME desktop. Use the
package provides, developers can add new functionality to gedit. if you
want to write plugins for gedit,please install gedit-devel.
%package help
Summary: documentation for user of gedit.
Requires: gedit = %{epoch}:%{version}-%{release}
%description help
documentationforuserof gedit.
%prep
%autosetup -n gedit-%{version} -p1
%build
%meson -Dgtk_doc=true
%meson_build
%install
%meson_install
%delete_la
%find_lang gedit --with-gnome
%check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.desktop
%files -f gedit.lang
%doc README.md COPYING
%{_datadir}/gedit
%{_datadir}/applications/org.gnome.gedit.desktop
%{python3_sitearch}/gi/overrides/Gedit.py*
%{python3_sitearch}/gi/overrides/__pycache__
%{_libdir}/gedit/girepository-1.0
%dir %{_libdir}/gedit
%dir %{_libdir}/gedit/plugins
%{_libdir}/gedit/libgedit-%{apiver}.so
%{_libdir}/gedit/plugins/{docinfo.plugin,libdocinfo.so,filebrowser.plugin,libfilebrowser.so,modelines.plugin}
%{_libdir}/gedit/plugins/{libmodelines.so,externaltools.plugin,externaltools,pythonconsole.plugin,pythonconsole}
%{_libdir}/gedit/plugins/{quickopen.plugin,quickopen,snippets.plugin,snippets,quickhighlight.plugin,libtime.so}
%{_libdir}/gedit/plugins/{sort.plugin,libsort.so,spell.plugin,libspell.so,time.plugin,libquickhighlight.so}
%{_bindir}/gedit
%{_datadir}/glib-2.0/schemas/{org.gnome.gedit.gschema.xml,org.gnome.gedit.enums.xml,org.gnome.gedit.plugins.time.gschema.xml}
%{_datadir}/glib-2.0/schemas/{org.gnome.gedit.plugins.externaltools.gschema.xml,org.gnome.gedit.plugins.time.enums.xml}
%{_datadir}/glib-2.0/schemas/{org.gnome.gedit.plugins.pythonconsole.gschema.xml,org.gnome.gedit.plugins.filebrowser.enums.xml}
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.spell.gschema.xml
%{_datadir}/dbus-1/services/org.gnome.gedit.service
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.gedit.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg
%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
%files devel
%{_includedir}/gedit-%{apiver}/
%{_libdir}/pkgconfig/gedit.pc
%{_datadir}/gtk-doc
%{_datadir}/vala/
%files help
%doc COPYING
%{_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
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 3.38.2-2
- DESC: delete -S git from %autosetup
* Mon May 24 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-1
- Upgrade to 3.38.2
- Update Epoch, Version, Release, Source0, BuildRequires, Requires
- Add patch 'python3-install-path-fix.patch', change files list
* Fri May 15 2020 Jeffery.Gao <gaojianxing@huawei.com> - 3.30.2-2
- Package init

View File

@ -1,4 +0,0 @@
version-control: NA
src_repo: NA
tag_prefix: NA
seperator: NA

View File

@ -1,12 +0,0 @@
diff --git a/gedit/meson.build b/gedit/meson.build
index a960e6c..47e1b8e 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -205,6 +205,7 @@ libgedit_gir = gnome.generate_gir(
python3.install_sources(
'Gedit.py',
+ pure: false,
subdir: 'gi/overrides',
)