From 6dd04456bf92c63613282d9d73dc4a3611257038 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:51:43 +0000 Subject: [PATCH 01/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 5abef8e..c071066 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.30-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Oct 01 2021 Kalev Lember - 0.30-26 - Avoid requiring systemd as per updated packaging guidelines - Drop ldconfig scriptlets From a0124e62e3468ce188491e3fe73c8157df2f9f84 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sun, 6 Feb 2022 18:45:51 +0100 Subject: [PATCH 02/14] + libcanberra-0.30-27 Update X11 avoidance patch --- ...-all-GdkDisplays-are-GdkX11Displays-.patch | 63 +++++++++++++++++-- libcanberra.spec | 6 +- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch index 6187900..763c3a9 100644 --- a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +++ b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -1,13 +1,14 @@ -From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 9 Nov 2012 16:16:40 +0000 Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland +Co-Authored-By: Bastien Nocera --- src/canberra-gtk-module.c | 15 +++++++++++++++ - src/canberra-gtk.c | 5 +++++ - 2 files changed, 20 insertions(+) + src/canberra-gtk.c | 28 ++++++++++++++++++++++------ + 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index 67791f0..c1532ab 100644 @@ -50,7 +51,7 @@ index 67791f0..c1532ab 100644 * ignore them */ diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c -index 34446f5..08cb668 100644 +index 34446f5..47285f8 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { @@ -65,6 +66,58 @@ index 34446f5..08cb668 100644 if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + + if (gtk_widget_get_realized(GTK_WIDGET(w))) { + GdkWindow *dw = NULL; ++#ifdef GDK_IS_X11_DISPLAY + GdkScreen *screen = NULL; ++#endif + GdkDisplay *display = NULL; + gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1; + +- if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) +- if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) +- return ret; ++ if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) { ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display)) { ++ if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) ++ return ret; ++ } ++#endif ++ } + + if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) { +- if ((t = gdk_display_get_name(display))) ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) { + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0) + return ret; ++ } ++#endif + + if (dw) { + gint desktop = window_get_desktop(display, dw); +@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + } + } + +- if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { + + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0) + return ret; +@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0) + return ret; + } +- ++#endif + /* FIXME, this might cause a round trip */ + + if (dw) { -- -1.9.0 +2.34.1 diff --git a/libcanberra.spec b/libcanberra.spec index 5abef8e..edb38a2 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Feb 06 2022 Bastien Nocera - 0.30-27 ++ libcanberra-0.30-27 +- Update X11 avoidance patch + * Fri Oct 01 2021 Kalev Lember - 0.30-26 - Avoid requiring systemd as per updated packaging guidelines - Drop ldconfig scriptlets From 8321a12330209c06b9e9a28f1a835c1cce1d6beb Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sun, 6 Feb 2022 18:45:51 +0100 Subject: [PATCH 03/14] + libcanberra-0.30-27 Update X11 avoidance patch --- ...-all-GdkDisplays-are-GdkX11Displays-.patch | 63 +++++++++++++++++-- libcanberra.spec | 6 +- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch index 6187900..763c3a9 100644 --- a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +++ b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -1,13 +1,14 @@ -From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 9 Nov 2012 16:16:40 +0000 Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland +Co-Authored-By: Bastien Nocera --- src/canberra-gtk-module.c | 15 +++++++++++++++ - src/canberra-gtk.c | 5 +++++ - 2 files changed, 20 insertions(+) + src/canberra-gtk.c | 28 ++++++++++++++++++++++------ + 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index 67791f0..c1532ab 100644 @@ -50,7 +51,7 @@ index 67791f0..c1532ab 100644 * ignore them */ diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c -index 34446f5..08cb668 100644 +index 34446f5..47285f8 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { @@ -65,6 +66,58 @@ index 34446f5..08cb668 100644 if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + + if (gtk_widget_get_realized(GTK_WIDGET(w))) { + GdkWindow *dw = NULL; ++#ifdef GDK_IS_X11_DISPLAY + GdkScreen *screen = NULL; ++#endif + GdkDisplay *display = NULL; + gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1; + +- if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) +- if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) +- return ret; ++ if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) { ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display)) { ++ if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) ++ return ret; ++ } ++#endif ++ } + + if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) { +- if ((t = gdk_display_get_name(display))) ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) { + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0) + return ret; ++ } ++#endif + + if (dw) { + gint desktop = window_get_desktop(display, dw); +@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + } + } + +- if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { + + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0) + return ret; +@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0) + return ret; + } +- ++#endif + /* FIXME, this might cause a round trip */ + + if (dw) { -- -1.9.0 +2.34.1 diff --git a/libcanberra.spec b/libcanberra.spec index c071066..377ed3c 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Feb 06 2022 Bastien Nocera - 0.30-28 ++ libcanberra-0.30-27 +- Update X11 avoidance patch + * Thu Jan 20 2022 Fedora Release Engineering - 0.30-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 461f39a003c02e71ec9964a6b77673e631001aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:25:15 +0000 Subject: [PATCH 04/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 377ed3c..c3c3742 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.30-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Feb 06 2022 Bastien Nocera - 0.30-28 + libcanberra-0.30-27 - Update X11 avoidance patch From a25d1b641853dee397e2771efef95b5d926eb9ce Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 10 Jan 2023 15:24:23 +0100 Subject: [PATCH 05/14] Don't build GTK 2 bits on ELN/RHEL 10 GTK 2 won't be part of RHEL 10, see the following announcements: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KH2BKEOZTLV4G6WF5FUXU6RYDPC62UEX/ https://github.com/minimization/content-resolver-input/pull/724 https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/9.1_release_notes/deprecated_functionality#deprecated-functionality_desktop --- libcanberra.spec | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index c3c3742..c6b99a8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,13 +1,22 @@ +# RHEL 10 won't ship with GTK 2, don't build bit there, but build them elsewhere +%if 0%{?rhel} > 9 +%bcond_with gtk2 +%else +%bcond_without gtk2 +%endif + Name: libcanberra Version: 0.30 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gcc +%if %{with gtk2} BuildRequires: gtk2-devel +%endif BuildRequires: gtk3-devel BuildRequires: alsa-lib-devel BuildRequires: libvorbis-devel @@ -26,6 +35,7 @@ Requires: pulseaudio-libs >= 0.9.15 A small and lightweight implementation of the XDG Sound Theme Specification (http://0pointer.de/public/sound-theme-spec.html). +%if %{with gtk2} %package gtk2 Summary: Gtk+ 2.x Bindings for libcanberra Requires: %{name}%{?_isa} = %{version}-%{release} @@ -34,6 +44,7 @@ Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} %description gtk2 Gtk+ 2.x bindings for libcanberra +%endif %package gtk3 Summary: Gtk+ 3.x Bindings for libcanberra @@ -45,9 +56,11 @@ Gtk+ 3.x bindings for libcanberra %package devel Summary: Development Files for libcanberra Client Development Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +%if %{with gtk2} +Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: gtk2-devel +%endif %description devel Development Files for libcanberra Client Development @@ -63,7 +76,17 @@ Development Files for libcanberra Client Development %patch0 -p1 %build -%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system +%configure \ + --disable-static \ + --enable-pulse \ + --enable-alsa \ +%if %{without gtk2} + --disable-gtk \ +%endif + --enable-null \ + --disable-oss \ + --with-builtin=dso \ + --with-systemdsystemunitdir=/usr/lib/systemd/system make %{?_smp_mflags} %install @@ -86,9 +109,11 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_prefix}/lib/systemd/system/canberra-system-shutdown.service %{_bindir}/canberra-boot +%if %{with gtk2} %files gtk2 %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so +%endif %files gtk3 %{_libdir}/libcanberra-gtk3.so.* @@ -111,12 +136,14 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %doc %{_datadir}/gtk-doc %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h -%{_libdir}/libcanberra-gtk.so -%{_libdir}/libcanberra-gtk3.so %{_libdir}/libcanberra.so -%{_libdir}/pkgconfig/libcanberra-gtk.pc -%{_libdir}/pkgconfig/libcanberra-gtk3.pc %{_libdir}/pkgconfig/libcanberra.pc +%if %{with gtk2} +%{_libdir}/libcanberra-gtk.so +%{_libdir}/pkgconfig/libcanberra-gtk.pc +%endif +%{_libdir}/libcanberra-gtk3.so +%{_libdir}/pkgconfig/libcanberra-gtk3.pc # co-own these directories to avoid requiring vala %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi @@ -124,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Jan 10 2023 Tomas Popela - 0.30-30 +- Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there + * Thu Jul 21 2022 Fedora Release Engineering - 0.30-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e0a79493cd9c32309fed94bb507ea807cd29151c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:56:41 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index c6b99a8..dba30f8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.30-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 10 2023 Tomas Popela - 0.30-30 - Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there From a02eae378ba421ead4a7621cc7951deac2b547ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:26:05 +0000 Subject: [PATCH 07/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index dba30f8..e4e2ee8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.30-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.30-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b26434df48d4002ffacc9dba40187c2cadf3bae6 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Fri, 13 Oct 2023 09:47:38 +0200 Subject: [PATCH 08/14] Migrate to SPDX license --- libcanberra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index e4e2ee8..b098db7 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,11 +7,11 @@ Name: libcanberra Version: 0.30 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch -License: LGPLv2+ +License: LGPL-2.1-or-later Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gcc %if %{with gtk2} @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Oct 13 2023 Niels De Graef - 0.30-33 +- Migrate to SPDX license + * Thu Jul 20 2023 Fedora Release Engineering - 0.30-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 086bbc76021a41cf630effcd8d72b0a299b0993b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:42:01 +0000 Subject: [PATCH 09/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index b098db7..7f27de8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.30-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Oct 13 2023 Niels De Graef - 0.30-33 - Migrate to SPDX license From da7f34cf62e6aabac9687313a4a1d0862c12c7fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:39:29 +0000 Subject: [PATCH 10/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 7f27de8..5cd748a 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.30-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.30-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4e8fff5d7d3a947fb368055368ad2dcdc99a077f Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 11/14] Eliminate use of obsolete %patchN syntax (#2283636) --- libcanberra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 5cd748a..67b6d8b 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -73,7 +73,7 @@ Development Files for libcanberra Client Development %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 %build %configure \ From 1d15da375397d306a8500657f06c58e003366734 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:27:38 +0000 Subject: [PATCH 12/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 67b6d8b..1894a5d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.30-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.30-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0df2bfea15d7a2189c9dabf84f145670c427b795 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:45:26 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 1894a5d..50cecaf 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.30-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.30-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 29c011d17386df273f015256edd4c06530b6ebe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:25:40 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 50cecaf..e3834df 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.30-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.30-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild