diff --git a/audacity-rpmlintrc b/audacity-rpmlintrc index 39db350..a317fca 100644 --- a/audacity-rpmlintrc +++ b/audacity-rpmlintrc @@ -1,2 +1 @@ addFilter("audacity.* desktopfile-without-binary") -addFilter("audacity.* devel-file-in-non-devel-package") diff --git a/audacity.changes b/audacity.changes index 48fd7a1..20f15ef 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 27 09:21:24 UTC 2022 - Dave Plater + +- Fix build with new carla by requiring carla-devel + +------------------------------------------------------------------- +Tue Apr 26 05:46:26 UTC 2022 - Dave Plater + +- Really solve boo#1198551 by packaging audacitie's libraries in + _libdir + ------------------------------------------------------------------- Thu Apr 21 09:00:40 UTC 2022 - Dave Plater diff --git a/audacity.spec b/audacity.spec index 4448e33..567a07b 100644 --- a/audacity.spec +++ b/audacity.spec @@ -41,6 +41,7 @@ BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ #!BuildIgnore: gstreamer-0_10-plugins-base +BuildRequires: carla-devel BuildRequires: hicolor-icon-theme BuildRequires: libmp3lame-devel BuildRequires: portmidi-devel @@ -164,6 +165,8 @@ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project. %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm rm -rf %{buildroot}%{_datadir}/pixmaps/ rm -rf %{buildroot}%{_datadir}/doc +mv -v %{buildroot}%{_libdir}/%{name}/*so %{buildroot}%{_libdir}/ +chmod 0755 %{buildroot}%{_libdir}/* # Why make install installs these is a mystery rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu-suse-nostl.so.* @@ -175,19 +178,16 @@ rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_qa-suse-nostl.so.* rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} -%post -ldconfig %{_libdir}/%{name} -%end +%post -p /sbin/ldconfig -%postun -ldconfig %{_libdir}/%{name} -%end +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt %{_bindir}/%{name} +%{_libdir}/*.so %{_libdir}/%{name} %{_libdir}/%{name}/modules/mod-script-pipe.so %{_datadir}/%{name}/