diff --git a/gedit-3.30.2.tar.xz b/gedit-3.30.2.tar.xz deleted file mode 100644 index a401b16..0000000 Binary files a/gedit-3.30.2.tar.xz and /dev/null differ diff --git a/gedit-3.38.2.tar.xz b/gedit-3.38.2.tar.xz new file mode 100644 index 0000000..a779041 Binary files /dev/null and b/gedit-3.38.2.tar.xz differ diff --git a/gedit.spec b/gedit.spec index db5953a..895dd3f 100644 --- a/gedit.spec +++ b/gedit.spec @@ -1,20 +1,25 @@ %global __python %{__python3} +%global apiver 3.38 + Name: gedit -Epoch: 2 -Version: 3.30.2 -Release: 2 +Version: 3.38.2 +Epoch: 1 +Release: 1 Summary: Text editor for the GNOME desktop License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Gedit -Source0: https://download.gnome.org/sources/gedit/3.30/gedit-%{version}.tar.xz -BuildRequires: gnome-common pkgconfig(glib-2.0) >= 2.44 pkgconfig(gtk+-3.0) >= 3.22.0 +Source0: https://download.gnome.org/sources/gedit/3.38/gedit-%{version}.tar.xz +Patch1: python3-install-path-fix.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) >= 0.2.5 python3-devel python3-gobject >= 3.0.0 -BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.22.0 pkgconfig(iso-codes) itstool vala +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 -Requires: glib2 >= 2.44 gspell >= 0.2.5 gtk3 >= 3.22.0 gtksourceview3 >= 3.22.0 -Requires: libpeas-loader-python3 python3-gobject >= 3.0.0 zenity glib2 >= 2.45.4-2 +BuildRequires: pkgconfig(libsoup-2.4) pkgconfig(tepl-5) >= 4.99.2 gtk-doc +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 @@ -43,13 +48,12 @@ documentationforuserof gedit. %autosetup -n gedit-%{version} -p1 -S git %build -%configure \ - --disable-gtk-doc --enable-introspection=yes --enable-python=yes \ - --disable-updater --enable-gvfs-metadata -%make_build +%meson -Dgtk_doc=true +%meson_build %install -%make_install +%meson_install + %delete_la %find_lang gedit --with-gnome @@ -58,33 +62,32 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/org.g desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.desktop %files -f gedit.lang -%doc README AUTHORS COPYING +%doc README.md COPYING %{_datadir}/gedit %{_datadir}/applications/org.gnome.gedit.desktop %{python3_sitearch}/gi/overrides/Gedit.py* %{python3_sitearch}/gi/overrides/__pycache__ -%{_libexecdir}/gedit %{_libdir}/gedit/girepository-1.0 %dir %{_libdir}/gedit %dir %{_libdir}/gedit/plugins -%{_libdir}/gedit/libgedit.so +%{_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}/* -%{_datadir}/GConf/gsettings +%{_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/*/apps/gedit.png -%{_datadir}/icons/hicolor/symbolic/apps/gedit-symbolic.svg +%{_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-3.14 +%{_includedir}/gedit-%{apiver}/ %{_libdir}/pkgconfig/gedit.pc %{_datadir}/gtk-doc %{_datadir}/vala/ @@ -94,5 +97,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de %{_mandir}/man1/* %changelog +* Mon May 24 2021 weijin deng - 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 - 3.30.2-2 - Package init diff --git a/python3-install-path-fix.patch b/python3-install-path-fix.patch new file mode 100644 index 0000000..c30c8de --- /dev/null +++ b/python3-install-path-fix.patch @@ -0,0 +1,12 @@ +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', + ) +