Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

10 changed files with 84 additions and 26 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libcanberra-0.30.tar.xz
/libcanberra-*.tar.xz

View File

@ -1 +0,0 @@
fd4c16e341ffc456d688ed3462930d17ca6f6c20 SOURCES/libcanberra-0.30.tar.xz

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

10
libcanberra-gtk-module.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
if [ -z "$GTK_MODULES" ] ; then
GTK_MODULES="canberra-gtk-module"
else
GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
fi
export GTK_MODULES

View File

@ -0,0 +1,24 @@
diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add 2011-01-07 22:48:49.388992626 -0500
+++ libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 -0500
@@ -932,11 +932,6 @@ static void connect_settings(void) {
connected = TRUE;
}
-static gboolean quit_handler(gpointer data) {
- dispatch_queue();
- return FALSE;
-}
-
G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
/* This is the same quark libgnomeui uses! */
@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
-
- gtk_quit_add(1, quit_handler, NULL);
}
G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);

View File

@ -1,16 +1,14 @@
Name: libcanberra
Version: 0.30
Release: 18%{?dist}
Release: 27%{?dist}
Summary: Portable Sound Event Library
Group: System Environment/Libraries
Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
Patch1: add-quiet-option.txt
Patch1: add-quiet-option.patch
Patch2: 0001-desktop-add-q-option-to-suppress-errors.patch
License: LGPLv2+
Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
BuildRequires: gcc
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: alsa-lib-devel
@ -22,6 +20,7 @@ BuildRequires: gstreamer1-devel
BuildRequires: libtdb-devel
BuildRequires: gettext-devel
BuildRequires: systemd-devel
BuildRequires: make
Requires: sound-theme-freedesktop
Requires: pulseaudio-libs >= 0.9.15
Requires(post): systemd
@ -34,7 +33,6 @@ A small and lightweight implementation of the XDG Sound Theme Specification
%package gtk2
Summary: Gtk+ 2.x Bindings for libcanberra
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
# Some other stuff is included in the gtk3 package, so always pull that in.
Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
@ -44,7 +42,6 @@ Gtk+ 2.x bindings for libcanberra
%package gtk3
Summary: Gtk+ 3.x Bindings for libcanberra
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description gtk3
@ -52,7 +49,6 @@ Gtk+ 3.x bindings for libcanberra
%package devel
Summary: Development Files for libcanberra Client Development
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
@ -62,25 +58,21 @@ Requires: gtk2-devel
Development Files for libcanberra Client Development
%post
/sbin/ldconfig
%{?ldconfig}
%systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
%preun
%systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
%postun
/sbin/ldconfig
%systemd_postun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
%ldconfig_postun
%post gtk2 -p /sbin/ldconfig
%postun gtk2 -p /sbin/ldconfig
%ldconfig_scriptlets gtk2
%post gtk3 -p /sbin/ldconfig
%postun gtk3 -p /sbin/ldconfig
%ldconfig_scriptlets gtk3
%prep
%setup -q
%patch0 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@ -146,14 +138,40 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%{_datadir}/vala/vapi/libcanberra.vapi
%changelog
* Thu Jan 03 2019 Wim Taymans <wtaymans@redhat.com> - 0.30-18
- Quiet theme sounds when not available
- Resolves: rhbz#1856770
- fix systemd_postun
* Thu Jul 13 2023 Wim Taymans <wtaymans@redhat.com> - 0.30-27
- Add -q option to disable warnings.
Resolves: rhbz#2222172
* Thu Jan 03 2019 Wim Taymans <wtaymans@redhat.com> - 0.30-17
- Add quiet option
- Resolves: rhbz#1556800
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.30-26
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.30-25
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Nov 8 2019 Tom Callaway <spot@fedoraproject.org> - 0.30-21
- remove %%systemd_postun macro to fix FTBFS
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.30-19
- Fix typo in postun
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
34cb7e4430afaf6f447c4ebdb9b42072 libcanberra-0.30.tar.xz