From 9c0260bc2694e604865a2beb75b5097ba1009e09 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 04:57:44 +0000 Subject: import gnome-screenshot-3.26.0-1.el7 --- diff --git a/.gitignore b/.gitignore index 96c2475..a7398cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-screenshot-3.22.0.tar.xz +SOURCES/gnome-screenshot-3.26.0.tar.xz diff --git a/.gnome-screenshot.metadata b/.gnome-screenshot.metadata index 5bcc943..f30e3c9 100644 --- a/.gnome-screenshot.metadata +++ b/.gnome-screenshot.metadata @@ -1 +1 @@ -210194845842c9273d8ba6bc60403beaaf27f75f SOURCES/gnome-screenshot-3.22.0.tar.xz +389b1d0d35f519d7dc6aefd5b98967c2092fe318 SOURCES/gnome-screenshot-3.26.0.tar.xz diff --git a/SOURCES/gnome-screenshot-python2.patch b/SOURCES/gnome-screenshot-python2.patch new file mode 100644 index 0000000..23287ea --- /dev/null +++ b/SOURCES/gnome-screenshot-python2.patch @@ -0,0 +1,8 @@ +--- gnome-screenshot-3.26.0/build-aux/postinstall.py.python2 2017-10-30 12:58:31.000000000 +0100 ++++ gnome-screenshot-3.26.0/build-aux/postinstall.py 2018-05-24 21:51:03.628740884 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/env python2 + + import os + import subprocess diff --git a/SPECS/gnome-screenshot.spec b/SPECS/gnome-screenshot.spec index cb320d4..e8ffb99 100644 --- a/SPECS/gnome-screenshot.spec +++ b/SPECS/gnome-screenshot.spec @@ -1,17 +1,21 @@ Name: gnome-screenshot -Version: 3.22.0 +Version: 3.26.0 Release: 1%{?dist} Summary: A screenshot utility for GNOME License: GPLv2+ URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-screenshot/3.22/gnome-screenshot-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-screenshot/3.26/gnome-screenshot-%{version}.tar.xz -BuildRequires: gtk3-devel -BuildRequires: libcanberra-devel -BuildRequires: intltool -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib +# Fix the build with Python 2 +Patch0: gnome-screenshot-python2.patch + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk3-devel +BuildRequires: libappstream-glib-devel +BuildRequires: libcanberra-devel +BuildRequires: meson Obsoletes: gnome-utils <= 1:3.3 Obsoletes: gnome-utils-libs <= 1:3.3 @@ -23,15 +27,16 @@ gnome-screenshot lets you take pictures of your screen. %prep %setup -q +%patch0 -p1 %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %find_lang %{name} @@ -53,13 +58,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %license COPYING %{_bindir}/gnome-screenshot %{_datadir}/GConf/gsettings/gnome-screenshot.convert -%{_datadir}/appdata/org.gnome.Screenshot.appdata.xml +%{_datadir}/metainfo/org.gnome.Screenshot.metainfo.xml %{_datadir}/applications/org.gnome.Screenshot.desktop %{_datadir}/dbus-1/services/org.gnome.Screenshot.service %{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml %{_mandir}/man1/gnome-screenshot.1* %changelog +* Wed Nov 01 2017 Kalev Lember - 3.26.0-1 +- Update to 3.26.0 +- Resolves: #1568233 + * Thu Feb 23 2017 Matthias Clasen - 3.22.0-1 - Rebase to 3.22.0 Resolves: rhbz#1386956