From 001f60ce17706f8f65bb63cbe10fbf8dc0429d0422319e09b17dbdec734bb93c Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 27 Feb 2018 04:04:13 +0000
Subject: [PATCH 1/2] Accepting request 580338 from
 home:elvigia:branches:GNOME:Factory

- Add explicit pkgconfig(pango) and pkgconfig(cairo) BuildRequires:
  closer alignment with what configure checks for.

OBS-URL: https://build.opensuse.org/request/show/580338
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gcr?expand=0&rev=67
---
 gcr.changes | 6 ++++++
 gcr.spec    | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gcr.changes b/gcr.changes
index 69e3b34..7999901 100644
--- a/gcr.changes
+++ b/gcr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 26 20:11:42 UTC 2018 - crrodriguez@opensuse.org
+
+- Add explicit pkgconfig(pango) and pkgconfig(cairo) BuildRequires: 
+  closer alignment with what configure checks for.
+
 -------------------------------------------------------------------
 Wed Aug 31 08:09:34 UTC 2016 - fezhang@suse.com
 
diff --git a/gcr.spec b/gcr.spec
index 2ca7f08..9c85a83 100644
--- a/gcr.spec
+++ b/gcr.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcr
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@ Version:        3.20.0
 Release:        0
 # FIXME: Verify if the requires in typelib-1_0-Gcr-3 is still correct and required (see bgo#725501).
 Summary:        Library for Crypto UI related task
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Libraries
 Url:            http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gcr/3.20/%{name}-%{version}.tar.xz
@@ -40,6 +40,7 @@ BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.18.0.22
 BuildRequires:  xsltproc
+BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.38.0
@@ -49,6 +50,7 @@ BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.12
 BuildRequires:  pkgconfig(libtasn1)
 BuildRequires:  pkgconfig(p11-kit-1) >= 0.19.0
+BuildRequires:  pkgconfig(pango)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -99,8 +101,8 @@ key stores.
 
 %package -n typelib-1_0-Gcr-3
 Summary:        Library for Crypto UI related task -- Introspection bindings
-Group:          System/Libraries
 # Due to broken typelib files, this one cannot be automatically inspected
+Group:          System/Libraries
 Requires:       typelib-1_0-Gck-1
 
 %description -n typelib-1_0-Gcr-3

From 06331c05e83e25cbea0c340562bd3ef3e5c346516e99c6bf6fb9e64ef2a4d98e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 27 Feb 2018 04:05:34 +0000
Subject: [PATCH 2/2] - Use SPDX3.0 license tags and package COPYING as
 %license.

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gcr?expand=0&rev=68
---
 gcr.changes | 5 +++++
 gcr.spec    | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gcr.changes b/gcr.changes
index 7999901..6043bb7 100644
--- a/gcr.changes
+++ b/gcr.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 27 04:05:25 UTC 2018 - dimstar@opensuse.org
+
+- Use SPDX3.0 license tags and package COPYING as %license.
+
 -------------------------------------------------------------------
 Mon Feb 26 20:11:42 UTC 2018 - crrodriguez@opensuse.org
 
diff --git a/gcr.spec b/gcr.spec
index 9c85a83..2d48d83 100644
--- a/gcr.spec
+++ b/gcr.spec
@@ -216,7 +216,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files viewer
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING HACKING NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog HACKING NEWS README
 %{_bindir}/gcr-viewer
 %{_datadir}/applications/gcr-viewer.desktop
 %{_datadir}/mime/packages/gcr-crypto-types.xml
@@ -240,7 +241,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files -n libgcr-3-1
 %defattr (-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog HACKING NEWS README
 %{_libdir}/libgcr-3.so.*
 %{_libdir}/libgcr-base-3.so.*
 %{_libdir}/libgcr-ui-3.so.*
@@ -268,7 +270,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files -n libgck-1-0
 %defattr (-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog HACKING NEWS README
 %{_libdir}/libgck-1.so.*
 
 %files -n typelib-1_0-Gck-1