Accepting request 1164596 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1164596
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcanberra?expand=0&rev=48

baselibs.conf

@@ -2,6 +2,6 @@ libcanberra0
 libcanberra-gtk0
 libcanberra-gtk3-0
 libcanberra-gtk2-module
-  supplements "packageand(libcanberra0:gtk2-<targettype>)"
+  supplements "(libcanberra0 and gtk2-<targettype>)"
 libcanberra-gtk3-module
-  supplements "packageand(libcanberra0:gtk3-<targettype>)"
+  supplements "(libcanberra0 and gtk3-<targettype>)"

libcanberra.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr  4 12:56:22 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Don't recommend the gtk modules unconditionally. They already have
+  conditional supplements.
+- Switch from packageand(x:y) to boolean dependencies
+- Use %license
+
 -------------------------------------------------------------------
 Mon Mar  4 09:03:31 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

libcanberra.spec

@@ -92,8 +92,6 @@ libcanberra from GTK+ 3 applications.
 %package gtk-module-common
 Summary:        Portable sound event library -- Common Files for GTK+ Modules
 Group:          System/Libraries
-Recommends:     %{name}-gtk2-module
-Recommends:     %{name}-gtk3-module
 
 %description gtk-module-common
 libcanberra is an implementation of the XDG Sound Theme and Name
@@ -108,7 +106,7 @@ modules.
 Summary:        Portable sound event library -- GTK+ 2 Module
 Group:          System/Libraries
 Requires:       %{name}-gtk-module-common = %{version}
-Supplements:    packageand(libcanberra0:gtk2)
+Supplements:    (libcanberra0 and gtk2)
 
 %description gtk2-module
 libcanberra is an implementation of the XDG Sound Theme and Name
@@ -123,7 +121,7 @@ event sounds.
 Summary:        Portable sound event library -- GTK+ 3 Module
 Group:          System/Libraries
 Requires:       %{name}-gtk-module-common = %{version}
-Supplements:    packageand(libcanberra0:gtk3)
+Supplements:    (libcanberra0 and gtk3)
 
 %description gtk3-module
 libcanberra is an implementation of the XDG Sound Theme and Name
@@ -248,7 +246,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %postun gtk3-0 -p /sbin/ldconfig
 
 %files -n libcanberra0
-%doc README LGPL
+%doc README
+%license LGPL
 %{_libdir}/libcanberra.so.*
 %dir %{_libdir}/libcanberra-%{version}/
 %{_libdir}/libcanberra-%{version}/libcanberra-alsa.so