From 20dbe6ddcb64a2138f4bf5c4fed51a05c0667eab73c8ca386e1b7f8b0af7a8fc Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 13 Sep 2022 07:36:05 +0000
Subject: [PATCH] Accepting request 1002676 from GNOME:Next

GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already)

OBS-URL: https://build.opensuse.org/request/show/1002676
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libnma?expand=0&rev=23
---
 fix-dependency-pc-name.patch | 11 +++++++++++
 libnma-1.10.2.tar.xz         |  3 +++
 libnma-1.8.40.tar.xz         |  3 ---
 libnma.changes               | 21 +++++++++++++++++++++
 libnma.spec                  | 10 ++++++++--
 5 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 fix-dependency-pc-name.patch
 create mode 100644 libnma-1.10.2.tar.xz
 delete mode 100644 libnma-1.8.40.tar.xz

diff --git a/fix-dependency-pc-name.patch b/fix-dependency-pc-name.patch
new file mode 100644
index 0000000..a5b77b3
--- /dev/null
+++ b/fix-dependency-pc-name.patch
@@ -0,0 +1,11 @@
+--- orig-libnma-1.10.0/meson.build	2022-09-07 16:53:19.000000000 +0200
++++ libnma-1.10.0/meson.build	2022-09-07 20:38:55.040696543 +0200
+@@ -277,7 +277,7 @@
+ if enable_gcr_gtk4
+   assert(enable_libnma_gtk4, 'gcr-gtk4 support was requested, but the libnma-gtk4 build was not enabled.')
+ 
+-  gcr4_gtk4_deps = dependency('gcr-4-gtk4', version: '>= 3.90', required: false)
++  gcr4_gtk4_deps = dependency('gcr-4', version: '>= 3.90', required: false)
+   assert(cc.compiles(gcr_api_check_src, dependencies: gcr4_gtk4_deps),
+     'gcr-gtk4 support was requested with -Dgcr_gtk4=true, but the gcr-gtk4 library is not available.')
+ 
diff --git a/libnma-1.10.2.tar.xz b/libnma-1.10.2.tar.xz
new file mode 100644
index 0000000..d4accd0
--- /dev/null
+++ b/libnma-1.10.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fc3d9c404b7b13303d9394f96961c5298d71afa9f1fa7af5e4f0f6e842a0940
+size 1360128
diff --git a/libnma-1.8.40.tar.xz b/libnma-1.8.40.tar.xz
deleted file mode 100644
index 8c5b77f..0000000
--- a/libnma-1.8.40.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:870a75f8d4641ed0d90f836aea6ff511224bde97ffd56d608ade2e9b5acb2b22
-size 1350560
diff --git a/libnma.changes b/libnma.changes
index 7b99829..fb23c27 100644
--- a/libnma.changes
+++ b/libnma.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Sep  9 14:27:01 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.10.2:
+  + Do not pop a certificate chooser if nobody clicked the button.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep  7 18:27:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.10.0:
+  + Libnma-gtk4 now has Smart Card support viad Gtk4-enabled
+    version of Gcr.
+  + nma-cert-chooser.c is now included in the list of translated
+    files.
+- Add fix-dependency-pc-name.patch: Update gcr-4.pc name to new
+  form. Following this: Add pkgconfig(gcr-4) and pkgconfig(gck-2)
+  BuildRequires and pass gcr_gtk4=true to meson, build the new
+  gcr-gtk4 based advanced certificate chooser.
+- Pass b_lto=true to meson, build with LTO support.
+
 -------------------------------------------------------------------
 Thu Jun 16 06:36:51 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/libnma.spec b/libnma.spec
index ba76bbd..f79c599 100644
--- a/libnma.spec
+++ b/libnma.spec
@@ -17,21 +17,25 @@
 
 
 %define sover 0
-%define base_ver 1.8
+%define base_ver 1.10
 
 Name:           libnma
-Version:        1.8.40
+Version:        1.10.2
 Release:        0
 Summary:        Shared library for NetworkManager-applet
 License:        GPL-2.0-or-later
 URL:            https://gitlab.gnome.org/GNOME/libnma
 Source0:        https://download.gnome.org/sources/%{name}/%{base_ver}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM fix-dependency-pc-name.patch -- Update .pc name to new form
+Patch0:         fix-dependency-pc-name.patch
 
 BuildRequires:  gtk-doc
 BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(gck-1) >= 3.14
+BuildRequires:  pkgconfig(gck-2)
 BuildRequires:  pkgconfig(gcr-3) >= 3.14
+BuildRequires:  pkgconfig(gcr-4)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.38
 BuildRequires:  pkgconfig(gmodule-export-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.9.6
@@ -110,7 +114,9 @@ Documentation files for %{name}.
 
 %build
 %meson \
+	-D b_lto=true \
 	-D libnma_gtk4=true \
+	-D gcr_gtk4=true \
 	%{nil}
 %meson_build