From 5b054026488212f9f93a88fbe1f49860cf80be4390ad2d94991e009c8cf2dbf8 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 26 Apr 2022 05:58:26 +0000 Subject: [PATCH 1/6] Accepting request 972740 from home:plater - Really solve boo#1198551 by packaging audacitie's libraries in _libdir OBS-URL: https://build.opensuse.org/request/show/972740 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=179 --- audacity.changes | 6 ++++++ audacity.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/audacity.changes b/audacity.changes index 48fd7a1..ab52a8b 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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..a7ebff8 100644 --- a/audacity.spec +++ b/audacity.spec @@ -164,6 +164,7 @@ 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}/ # Why make install installs these is a mystery rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu-suse-nostl.so.* @@ -176,11 +177,11 @@ rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} %post -ldconfig %{_libdir}/%{name} +ldconfig %end %postun -ldconfig %{_libdir}/%{name} +ldconfig %end %files @@ -188,7 +189,7 @@ ldconfig %{_libdir}/%{name} %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt %{_bindir}/%{name} -%{_libdir}/%{name} +%{_libdir} %{_libdir}/%{name}/modules/mod-script-pipe.so %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop From c7c0ebe6131d131f88bbd3638a0914944bf89a51e57273d7a7697859649fe0e2 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 26 Apr 2022 12:02:27 +0000 Subject: [PATCH 2/6] Accepting request 972794 from home:plater don't own library directory OBS-URL: https://build.opensuse.org/request/show/972794 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=180 --- audacity.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audacity.spec b/audacity.spec index a7ebff8..10520e3 100644 --- a/audacity.spec +++ b/audacity.spec @@ -189,7 +189,7 @@ ldconfig %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt %{_bindir}/%{name} -%{_libdir} +%{_libdir}/*.so %{_libdir}/%{name}/modules/mod-script-pipe.so %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop From d5f28568d1acbea085441f78ef5c31d21eda63ae379be3022383f50f0113808c Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 27 Apr 2022 10:30:26 +0000 Subject: [PATCH 3/6] Accepting request 973094 from home:plater - Fix build with new carla by requiring carla-devel OBS-URL: https://build.opensuse.org/request/show/973094 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=181 --- audacity-rpmlintrc | 1 - audacity.changes | 5 +++++ audacity.spec | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) 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 ab52a8b..20f15ef 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/audacity.spec b/audacity.spec index 10520e3..b2a7d99 100644 --- a/audacity.spec +++ b/audacity.spec @@ -46,6 +46,7 @@ BuildRequires: libmp3lame-devel BuildRequires: portmidi-devel BuildRequires: wxWidgets-3_2-nostl-devel BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(carla-native-plugin) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(flac) >= 1.3.1 BuildRequires: pkgconfig(flac++) @@ -165,6 +166,7 @@ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project. 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.* @@ -190,6 +192,7 @@ ldconfig %license LICENSE.txt LICENSE_NYQUIST.txt %{_bindir}/%{name} %{_libdir}/*.so +%{_libdir}/%{name} %{_libdir}/%{name}/modules/mod-script-pipe.so %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop From 1d26c82210077a9106d042c8203991a39f45481c0e4493ece346d40cd9dd1351 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 27 Apr 2022 10:40:59 +0000 Subject: [PATCH 4/6] Accepting request 973097 from home:plater use carla-devel instead of pkgconfig for Leap OBS-URL: https://build.opensuse.org/request/show/973097 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=182 --- audacity.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audacity.spec b/audacity.spec index b2a7d99..ff58485 100644 --- a/audacity.spec +++ b/audacity.spec @@ -41,12 +41,12 @@ 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 BuildRequires: wxWidgets-3_2-nostl-devel BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(carla-native-plugin) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(flac) >= 1.3.1 BuildRequires: pkgconfig(flac++) From 552751bfa5d6d668562e610f454e85c565ecfa35b46106c4ac5c604f08cc5a19 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 27 Apr 2022 12:29:06 +0000 Subject: [PATCH 5/6] Accepting request 973173 from home:plater Fix post and postun OBS-URL: https://build.opensuse.org/request/show/973173 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=183 --- audacity.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/audacity.spec b/audacity.spec index ff58485..dd60fae 100644 --- a/audacity.spec +++ b/audacity.spec @@ -178,13 +178,9 @@ rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_qa-suse-nostl.so.* rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} -%post -ldconfig -%end +%post /sbin/ldconfig -%postun -ldconfig -%end +%postun /sbin/ldconfig %files %defattr(-,root,root) From 0ed392774112185d713bf725b8e92c9fd004d26b879c12492e74359af0b4c359 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 27 Apr 2022 13:52:22 +0000 Subject: [PATCH 6/6] Accepting request 973213 from home:plater fix post and postun OBS-URL: https://build.opensuse.org/request/show/973213 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=184 --- audacity.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audacity.spec b/audacity.spec index dd60fae..567a07b 100644 --- a/audacity.spec +++ b/audacity.spec @@ -178,9 +178,9 @@ rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_qa-suse-nostl.so.* rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} -%post /sbin/ldconfig +%post -p /sbin/ldconfig -%postun /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root)