diff --git a/.gitignore b/.gitignore index bc10750..3879756 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.42.0.tar.bz2 /gnome-terminal-3.42.1.tar.bz2 /gnome-terminal-3.42.2.tar.xz +/gnome-terminal-3.42.3.tar.xz diff --git a/gnome-terminal-3.42.3-meson-fix.patch b/gnome-terminal-3.42.3-meson-fix.patch new file mode 100644 index 0000000..8b6edbb --- /dev/null +++ b/gnome-terminal-3.42.3-meson-fix.patch @@ -0,0 +1,47 @@ +From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson + +--- + data/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 79d97e5b..e0bcbb91 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = gt_datadir / 'metainfo' + + i18n.merge_file( +- gt_dns_name + '.metainfo.xml', + input: gt_dns_name + '.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -27,7 +26,6 @@ i18n.merge_file( + ) + + i18n.merge_file( +- gt_dns_name + '.Nautilus.metainfo.xml', + input: gt_dns_name + '.Nautilus.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -40,7 +38,6 @@ i18n.merge_file( + desktopdatadir = gt_datadir / 'applications' + + i18n.merge_file( +- gt_dns_name + '.desktop', + input: gt_dns_name + '.desktop.in', + output: '@BASENAME@', + type: 'desktop', +@@ -57,4 +54,4 @@ meson.add_install_script( + + # Subdirs + +-subdir('icons') +\ No newline at end of file ++subdir('icons') +-- +GitLab + diff --git a/gnome-terminal.spec b/gnome-terminal.spec index c85e8d4..bb0ac49 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,7 +7,7 @@ %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.42.2 +Version: 3.42.3 Release: 1%{?dist} Summary: Terminal emulator for GNOME @@ -17,6 +17,7 @@ Source0: https://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar. Source1: org.gnome.Terminal.gschema.override Patch0: gnome-terminal-cntr-ntfy-autottl-ts.patch +Patch1: gnome-terminal-3.42.3-meson-fix.patch BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -36,6 +37,7 @@ BuildRequires: libxslt BuildRequires: meson BuildRequires: systemd-rpm-macros BuildRequires: yelp-tools +BuildRequires: /usr/bin/appstream-util Requires: dbus Requires: glib2%{?_isa} >= %{glib2_version} @@ -78,15 +80,14 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas %find_lang %{gettext_package} --with-gnome %check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.Terminal*.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop %meson_test %files -f %{gettext_package}.lang %license COPYING %doc AUTHORS README.md - %{_bindir}/gnome-terminal -%{_datadir}/metainfo/org.gnome.Terminal.metainfo.xml %{_datadir}/applications/org.gnome.Terminal.desktop %{_libexecdir}/gnome-terminal-server %{_datadir}/dbus-1/services/org.gnome.Terminal.service @@ -95,18 +96,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de %{_datadir}/gnome-shell %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg -%{_datadir}/man/man1/gnome-terminal.1* - %dir %{_libdir}/gnome-terminal %{_libdir}/gnome-terminal/gschemas.compiled - +%{_mandir}/man1/gnome-terminal.1* +%{_metainfodir}/org.gnome.Terminal.metainfo.xml %{_userunitdir}/gnome-terminal-server.service %files nautilus %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so -%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml +%{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Sun May 29 2022 David King - 3.42.3-1 +- Update to 3.42.3 + * Thu Dec 16 2021 David King - 3.42.2-1 - Update to 3.42.2 diff --git a/sources b/sources index 7a033fc..1f7ebef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.42.2.tar.xz) = 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e +SHA512 (gnome-terminal-3.42.3.tar.xz) = 369a464c18dc95127ededcf83fb861839858735c396724ab25ba20f80e8870040007db67cdd87edc21686742affc12c706d98f451208622bd76a46d6b0c62f50