From c2ce63e9de019ae1a80795131dfdb6290761a6ee Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Tue, 26 Oct 2021 21:10:39 +0200 Subject: [PATCH] Address review feedback Adjust (Build)Require clauses and included files according to review feedback --- gtksourceview5.spec | 69 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/gtksourceview5.spec b/gtksourceview5.spec index eae3c6d..78abe41 100644 --- a/gtksourceview5.spec +++ b/gtksourceview5.spec @@ -1,33 +1,39 @@ %global glib_version 2.66 %global gtk_version 4.2 +%global majorver 5 +%global minorver 2 +%global patchver 0 + Name: gtksourceview5 -Version: 5.1.0 +Version: %{majorver}.%{minorver}.%{patchver} Release: 1%{?dist} Summary: Source code editing widget License: LGPLv2+ URL: https://wiki.gnome.org/Projects/GtkSourceView -Source0: https://download.gnome.org/sources/gtksourceview/5.1/gtksourceview-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gtksourceview/%{majorver}.%{minorver}/gtksourceview-%{version}.tar.xz BuildRequires: gcc +BuildRequires: gettext +BuildRequires: gtk-doc +BuildRequires: itstool BuildRequires: meson -BuildRequires: pkgconfig(glib-2.0) >= %{glib_version} +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(gio-2.0) >= %{glib_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib_version} BuildRequires: pkgconfig(gobject-2.0) >= %{glib_version} -BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.42.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk4) >= %{gtk_version} -BuildRequires: pkgconfig(gtk-doc) >= 1.25 -BuildRequires: pkgconfig(libxml-2.0) >= 2.6 -BuildRequires: pkgconfig(fribidi) >= 0.19.7 -BuildRequires: pkgconfig(libpcre2-8) >= 10.21 -BuildRequires: pkgconfig(vapigen) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pangoft2) +BuildRequires: pkgconfig(libpcre2-8) +BuildRequires: vala Requires: glib2%{?_isa} >= %{glib_version} Requires: gtk4%{?_isa} >= %{gtk_version} -Requires: pcre2 -Requires: libxml2 -Requires: fribidi +Requires: hicolor-icon-theme %description GtkSourceView is a GNOME library that extends GtkTextView, the standard GTK+ @@ -36,7 +42,7 @@ highlighting, undo/redo, file loading and saving, search and replace, a completion system, printing, displaying line numbers, and other features typical of a source code editor. -This package contains version 5 of GtkSourceView. +This package contains version %{major} of GtkSourceView. %package devel Summary: Development files for %{name} @@ -58,43 +64,34 @@ the functionality of the installed %{name} package. %autosetup -n gtksourceview-%{version} %build -%meson -Dgtk_doc=true -Dinstall_tests=true +%meson -Dgtk_doc=true -Dsysprof=true -Dinstall_tests=true %meson_build %install %meson_install -%find_lang gtksourceview-5 +%find_lang gtksourceview-%{majorver} -%files -f gtksourceview-5.lang +%files -f gtksourceview-%{majorver}.lang %license COPYING -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/GtkSource-5.typelib -%{_libdir}/libgtksourceview-5.so.0* -%{_datadir}/gtksourceview-5/ +%{_libdir}/girepository-1.0/GtkSource-%{majorver}.typelib +%{_libdir}/libgtksourceview-%{majorver}.so.0* +%{_datadir}/gtksourceview-%{majorver}/ %{_datadir}/icons/hicolor/scalable/actions/* -%{_bindir}/%{name}-widget %files devel -%{_includedir}/gtksourceview-5/ +%{_includedir}/gtksourceview-%{majorver}/ %{_libdir}/pkgconfig/*.pc -%{_libdir}/libgtksourceview-5.so -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/GtkSource-5.gir -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html +%{_libdir}/libgtksourceview-%{majorver}.so +%{_datadir}/gir-1.0/GtkSource-%{majorver}.gir %{_datadir}/gtk-doc/html/* -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/gtksourceview-5.deps -%{_datadir}/vala/vapi/gtksourceview-5.vapi +%{_datadir}/vala %files tests -%dir %{_libexecdir}/installed-tests -%{_libexecdir}/installed-tests/gtksourceview-5/ -%dir %{_datadir}/installed-tests -%{_datadir}/installed-tests/gtksourceview-5/ +%{_bindir}/gtksourceview%{majorver}-widget +%{_libexecdir}/installed-tests +%{_datadir}/installed-tests %changelog -* Wed Aug 25 2021 Amanda Graven - 5.1.0-1 +* Tue Oct 25 2021 Amanda Graven - 5.2.0-1 - Initial packaging of GtkSourceView 5