From b41b1b376ed1b827ff6fffd214136dae69b8334cc391261e789d3fc2354b2178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Thu, 9 Dec 2021 14:38:54 +0000
Subject: [PATCH] Accepting request 935958 from GNOME:Next

- Update to version 41.1:
  + Updated translations.
- Drop yelp-xsl-lang Obsoletes, we have had this since version
  3.3.1, so it is pretty safe to assume everyone have updated since
  that version (10 years ago).
- Add yelp-xsl-rpmlintrc file, filter out warning about devel file
  in non-devel package (.pc file).

OBS-URL: https://build.opensuse.org/request/show/935958
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/yelp-xsl?expand=0&rev=108
---
 yelp-xsl-41.0.tar.xz |  3 ---
 yelp-xsl-41.1.tar.xz |  3 +++
 yelp-xsl-rpmlintrc   |  2 ++
 yelp-xsl.changes     | 11 +++++++++++
 yelp-xsl.spec        |  9 ++-------
 5 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 yelp-xsl-41.0.tar.xz
 create mode 100644 yelp-xsl-41.1.tar.xz
 create mode 100644 yelp-xsl-rpmlintrc

diff --git a/yelp-xsl-41.0.tar.xz b/yelp-xsl-41.0.tar.xz
deleted file mode 100644
index 62bcb53..0000000
--- a/yelp-xsl-41.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8cd64c093bbd8c5d5e47fd38864e90831b5f9cf7403530870206fa96636a4a5
-size 661412
diff --git a/yelp-xsl-41.1.tar.xz b/yelp-xsl-41.1.tar.xz
new file mode 100644
index 0000000..080edd5
--- /dev/null
+++ b/yelp-xsl-41.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+size 661572
diff --git a/yelp-xsl-rpmlintrc b/yelp-xsl-rpmlintrc
new file mode 100644
index 0000000..6951a97
--- /dev/null
+++ b/yelp-xsl-rpmlintrc
@@ -0,0 +1,2 @@
+# There is no need to split out a dummy devel package for the pc file.
+addFilter("devel-file-in-non-devel-package*");
diff --git a/yelp-xsl.changes b/yelp-xsl.changes
index 8c7f91c..b357172 100644
--- a/yelp-xsl.changes
+++ b/yelp-xsl.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec  3 21:13:54 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 41.1:
+  + Updated translations.
+- Drop yelp-xsl-lang Obsoletes, we have had this since version
+  3.3.1, so it is pretty safe to assume everyone have updated since
+  that version (10 years ago).
+- Add yelp-xsl-rpmlintrc file, filter out warning about devel file
+  in non-devel package (.pc file).
+
 -------------------------------------------------------------------
 Sun Sep 19 19:49:47 UTC 2021 - Michael Gorse <mgorse@suse.com>
 
diff --git a/yelp-xsl.spec b/yelp-xsl.spec
index 1e1325e..0c73cc6 100644
--- a/yelp-xsl.spec
+++ b/yelp-xsl.spec
@@ -18,21 +18,19 @@
 
 
 Name:           yelp-xsl
-Version:        41.0
+Version:        41.1
 Release:        0
 Summary:        XSL stylesheets for the yelp help browser
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/GUI/GNOME
 URL:            https://wiki.gnome.org/Apps/Yelp
 Source0:        https://download.gnome.org/sources/yelp-xsl/41/%{name}-%{version}.tar.xz
+Source99:       yelp-xsl-rpmlintrc
 
 BuildRequires:  itstool >= 1.2.0
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
-# The lang subpackage is obsoleted now that translationed are
-# merged inline in xml file, since 3.1.1.
-Obsoletes:      %{name}-lang < %{version}
 BuildArch:      noarch
 
 %description
@@ -52,9 +50,6 @@ This package contains XSL stylesheets that are used by the yelp help browser.
 %license COPYING
 %doc AUTHORS
 %{_datadir}/yelp-xsl/
-# This needs to be observed. As long as it does not Require: anything
-# we can probably leave it here without splitting a dummy -devel
-# package for it.
 %{_datadir}/pkgconfig/yelp-xsl.pc
 
 %changelog