Update to 3.31.90

- Switch to the meson build system
This commit is contained in:
Kalev Lember 2019-02-04 10:47:02 +01:00
parent 9d71c8d33b
commit 6c1edb7a44
3 changed files with 24 additions and 49 deletions

1
.gitignore vendored
View File

@ -109,3 +109,4 @@ gedit-2.31.6.tar.bz2
/gedit-3.30.0.tar.xz
/gedit-3.30.1.tar.xz
/gedit-3.30.2.tar.xz
/gedit-3.31.90.tar.xz

View File

@ -4,67 +4,54 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
%if 0%{?fedora} > 12
%global with_python3 1
%else
%global with_python3 0
%endif
%if %{with_python3}
%global __python %{__python3}
%endif
%global glib2_version 2.44
%global gtk3_version 3.22.0
%global gtksourceview_version 3.22.0
%global gtksourceview_version 4.0.2
%global libpeas_version 1.14.1
%global gspell_version 0.2.5
%global pygo_version 3.0.0
Name: gedit
Epoch: 2
Version: 3.30.2
Release: 2%{?dist}
Version: 3.31.90
Release: 1%{?dist}
Summary: Text editor for the GNOME desktop
License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Gedit
Source0: https://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/3.31/%{name}-%{version}.tar.xz
BuildRequires: gnome-common
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gspell-1) >= %{gspell_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(gtksourceview-3.0) >= %{gtksourceview_version}
BuildRequires: pkgconfig(gtksourceview-4) >= %{gtksourceview_version}
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= %{libpeas_version}
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pygobject-3.0)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gtk-doc
BuildRequires: which
BuildRequires: intltool
BuildRequires: yelp-tools
BuildRequires: itstool
BuildRequires: meson
BuildRequires: vala
%if %{with_python3}
BuildRequires: python3-devel
BuildRequires: python3-gobject >= %{pygo_version}
%else
BuildRequires: python-devel
%endif
BuildRequires: /usr/bin/appstream-util
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gspell%{?_isa} >= %{gspell_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
Requires: gtksourceview3%{?_isa} >= %{gtksourceview_version}
%if %{with_python3}
Requires: gtksourceview4%{?_isa} >= %{gtksourceview_version}
Requires: libpeas-loader-python3%{?_isa}
Requires: python3-gobject >= %{pygo_version}
%endif
# the run-command plugin uses zenity
Requires: zenity
Requires: gsettings-desktop-schemas
@ -103,24 +90,14 @@ Install gedit-devel if you want to write plugins for gedit.
%setup -q
%build
%configure \
--disable-static \
--disable-gtk-doc \
--enable-introspection=yes \
%if %{with_python3}
--enable-python=yes \
%else
--enable-python=no \
%endif
--disable-updater \
--enable-gvfs-metadata
%meson -Ddocumentation=true
# parallel make disabled to work around desktop file translations going missing
make
%define __ninja_common_opts -v
%meson_build
%install
%make_install
find $RPM_BUILD_ROOT -name '*.la' -delete
%meson_install
%find_lang %{name} --with-gnome
@ -129,27 +106,24 @@ 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 %{name}.lang
%doc README AUTHORS
%doc AUTHORS README.md
%license COPYING
%{_datadir}/gedit
%{_datadir}/applications/org.gnome.gedit.desktop
%{_mandir}/man1/*
%if %{with_python3}
%{python3_sitearch}/gi/overrides/Gedit.py*
%{python3_sitearch}/gi/overrides/__pycache__
%endif
%{_libexecdir}/gedit
%{_libdir}/gedit/girepository-1.0
%dir %{_libdir}/gedit
%dir %{_libdir}/gedit/plugins
%{_libdir}/gedit/libgedit.so
%{_libdir}/gedit/libgedit-3.14.so
%{_libdir}/gedit/plugins/docinfo.plugin
%{_libdir}/gedit/plugins/libdocinfo.so
%{_libdir}/gedit/plugins/filebrowser.plugin
%{_libdir}/gedit/plugins/libfilebrowser.so
%{_libdir}/gedit/plugins/modelines.plugin
%{_libdir}/gedit/plugins/libmodelines.so
%if %{with_python3}
%{_libdir}/gedit/plugins/externaltools.plugin
%{_libdir}/gedit/plugins/externaltools
%{_libdir}/gedit/plugins/pythonconsole.plugin
@ -158,7 +132,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
%{_libdir}/gedit/plugins/quickopen
%{_libdir}/gedit/plugins/snippets.plugin
%{_libdir}/gedit/plugins/snippets
%endif
%{_libdir}/gedit/plugins/quickhighlight.plugin
%{_libdir}/gedit/plugins/libquickhighlight.so
%{_libdir}/gedit/plugins/sort.plugin
@ -168,20 +141,17 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
%{_libdir}/gedit/plugins/time.plugin
%{_libdir}/gedit/plugins/libtime.so
%{_bindir}/*
%{_datadir}/GConf/gsettings
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
%if %{with_python3}
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
%endif
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.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/*/apps/org.gnome.gedit.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg
%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
%files devel
@ -191,6 +161,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
%{_datadir}/vala/
%changelog
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 2:3.31.90-1
- Update to 3.31.90
- Switch to the meson build system
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.30.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (gedit-3.30.2.tar.xz) = 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
SHA512 (gedit-3.31.90.tar.xz) = d88bd790e47285b8d7d59d9a3b96eb8ce0cf4679af18eaa462aee6d0521d5546a657427c34bf8df25f2d3cbb360ef0516dee5cafd302801ca61a5c02a4840c7d