From e9c70144f0e3e46f1699ffdb7979a980cd68dc673b2f8fe53512545b7b36719e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 28 Jun 2021 16:01:15 +0000
Subject: [PATCH] Accepting request 902850 from GNOME:Next

- Fold typelib-1_0-Polari-1_0 into the main package: the .typelib
  file is installed in a private gi-repository.
- Obsolete the old package name to ease upgrades.

OBS-URL: https://build.opensuse.org/request/show/902850
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/polari?expand=0&rev=113
---
 polari.changes |  7 +++++++
 polari.spec    | 15 +++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/polari.changes b/polari.changes
index 0419ef3..ad5dc50 100644
--- a/polari.changes
+++ b/polari.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 28 14:05:24 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fold typelib-1_0-Polari-1_0 into the main package: the .typelib
+  file is installed in a private gi-repository.
+- Obsolete the old package name to ease upgrades.
+
 -------------------------------------------------------------------
 Fri Jun 25 20:35:23 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/polari.spec b/polari.spec
index 6734ceb..0fd8113 100644
--- a/polari.spec
+++ b/polari.spec
@@ -47,20 +47,13 @@ Requires:       telepathy-logger
 Requires:       telepathy-mission-control
 # Dependency not detected by the dep scanner - boo#1122687
 Requires:       typelib(Gspell)
+# typelib-1_0-Polari-1_0 was merged into the main package, as it's in a private library directory
+Obsoletes:      typelib-1_0-Polari-1_0 < %{version}
 
 %description
 Polari is an IRC client that is designed to integrate seamlessly
 with GNOME 3.
 
-%package -n typelib-1_0-Polari-1_0
-Summary:        Introspection bindings for Polari client library
-Group:          System/Libraries
-
-%description -n typelib-1_0-Polari-1_0
-Polari is an IRC client that is designed to integrate seamlessly
-with GNOME 3.
-This package contains Introspection bindings.
-
 %lang_package
 
 %prep
@@ -89,10 +82,8 @@ This package contains Introspection bindings.
 %dir %{_datadir}/telepathy/clients
 %{_datadir}/telepathy/clients/Polari.client
 %{_datadir}/icons/hicolor/*/apps/*
-%{_libdir}/polari/libpolari-1.0.so
-
-%files -n typelib-1_0-Polari-1_0
 %dir %{_libdir}/polari
+%{_libdir}/polari/libpolari-1.0.so
 %dir %{_libdir}/polari/girepository-1.0
 %{_libdir}/polari/girepository-1.0/Polari-1.0.typelib