diff --git a/libcanberra.spec b/libcanberra.spec index e3834df..edb38a2 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,22 +1,13 @@ -# 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: 38%{?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 -License: LGPL-2.1-or-later +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 @@ -35,7 +26,6 @@ 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} @@ -44,7 +34,6 @@ Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} %description gtk2 Gtk+ 2.x bindings for libcanberra -%endif %package gtk3 Summary: Gtk+ 3.x Bindings for libcanberra @@ -56,11 +45,9 @@ Gtk+ 3.x bindings for libcanberra %package devel Summary: Development Files for libcanberra Client Development Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} -%if %{with gtk2} Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: gtk2-devel -%endif %description devel Development Files for libcanberra Client Development @@ -73,20 +60,10 @@ Development Files for libcanberra Client Development %prep %setup -q -%patch -P0 -p1 +%patch0 -p1 %build -%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 +%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system make %{?_smp_mflags} %install @@ -109,11 +86,9 @@ 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.* @@ -136,14 +111,12 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %doc %{_datadir}/gtk-doc %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h -%{_libdir}/libcanberra.so -%{_libdir}/pkgconfig/libcanberra.pc -%if %{with gtk2} %{_libdir}/libcanberra-gtk.so -%{_libdir}/pkgconfig/libcanberra-gtk.pc -%endif %{_libdir}/libcanberra-gtk3.so +%{_libdir}/libcanberra.so +%{_libdir}/pkgconfig/libcanberra-gtk.pc %{_libdir}/pkgconfig/libcanberra-gtk3.pc +%{_libdir}/pkgconfig/libcanberra.pc # co-own these directories to avoid requiring vala %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi @@ -151,43 +124,10 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Sun Feb 06 2022 Bastien Nocera - 0.30-28 +* Sun Feb 06 2022 Bastien Nocera - 0.30-27 + 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 - * Fri Oct 01 2021 Kalev Lember - 0.30-26 - Avoid requiring systemd as per updated packaging guidelines - Drop ldconfig scriptlets