From a470eb8ceeb89d65a18e589ab9e5ad9941a707f18061950fdf4581a7dc94369b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 4 Apr 2022 13:39:19 +0000
Subject: [PATCH] Accepting request 966455 from home:dirkmueller:Factory

- remove provides/obsoletes on glib2-doc, it was split into
  two packages again
- spec-cleaner reorderings

OBS-URL: https://build.opensuse.org/request/show/966455
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=478
---
 glib2.changes |  7 +++++++
 glib2.spec    | 15 ++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/glib2.changes b/glib2.changes
index f452899..2870d80 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr  1 08:17:46 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- remove provides/obsoletes on glib2-doc, it was split into
+  two packages again 
+- spec-cleaner reorderings
+
 -------------------------------------------------------------------
 Fri Mar 25 14:02:31 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/glib2.spec b/glib2.spec
index 6da8194..ed68650 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -16,7 +16,6 @@
 #
 
 
-%bcond_without     systemtap
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "doc"
 %global psuffix -doc
@@ -29,6 +28,7 @@
 %define libgmodule libgmodule-%{libver}
 %define libgobject libgobject-%{libver}
 %define libgthread libgthread-%{libver}
+%bcond_without     systemtap
 Name:           glib2%{psuffix}
 Version:        2.72.0
 Release:        0
@@ -58,10 +58,6 @@ Patch2:         glib2-suppress-schema-deprecated-path-warning.patch
 Patch3:         glib2-dbus-socket-path.patch
 # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch  olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
 Patch4:         glib2-gdbus-codegen-version.patch
-%if "%{flavor}" == "doc"
-# Split-provides
-Provides:       glib2-devel:%{_datadir}/gtk-doc/html/gobject/index.html
-%endif
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -80,6 +76,10 @@ BuildRequires:  pkgconfig(libpcre) >= 8.31
 BuildRequires:  pkgconfig(mount) >= 2.28
 BuildRequires:  pkgconfig(zlib)
 %if "%{flavor}" == "doc"
+# Split-provides
+Provides:       glib2-devel:%{_datadir}/gtk-doc/html/gobject/index.html
+%endif
+%if "%{flavor}" == "doc"
 BuildRequires:  glib2-devel
 BuildRequires:  gtk-doc >= 1.32
 %endif
@@ -148,8 +148,6 @@ Requires:       glibc-devel
 Requires:       pkgconfig
 # Required by gdbus-codegen
 Requires:       python3-xml
-Provides:       %{name}-doc = 2.19.6
-Obsoletes:      %{name}-doc < 2.19.6
 #
 
 %description devel
@@ -197,10 +195,10 @@ object files (commonly known as 'plug-ins').
 
 %package -n %{libgio}
 Summary:        A virtual file system library API
+Group:          System/Libraries
 # The tools are useful for people having libgio
 # bnc#555605: shared-mime-info is required by libgio to properly detect mime types, but not during build
 #!BuildIgnore:  shared-mime-info
-Group:          System/Libraries
 Requires:       %{name}-tools
 # bnc#678518: libgio interacts with others by means of dbus-launch
 Requires:       dbus-launch
@@ -360,7 +358,6 @@ done
 #%%meson_test
 
 %post -n libgmodule-2_0-0 -p /sbin/ldconfig
-
 %postun -n %{libglib} -p %{ldconfig}
 %postun -n %{libgobject} -p %{ldconfig}
 %postun -n %{libgthread} -p %{ldconfig}