Accepting request 391493 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/391493
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=68

audacity-2.1.1-fix-tempdir.patch

@@ -0,0 +1,11 @@
+--- a/src/AudacityApp.cpp
++++ b/src/AudacityApp.cpp
+@@ -1640,7 +1640,7 @@ bool AudacityApp::CreateSingleInstanceCh
+    mChecker = new wxSingleInstanceChecker();
+ 
+ #if defined(__UNIX__)
+-   wxString sockFile(defaultTempDir + wxT("/.audacity.sock"));
++   wxString sockFile(dir + wxT("/.audacity.sock"));
+ #endif
+ 
+    wxString runningTwoCopiesStr = _("Running two copies of Audacity simultaneously may cause\ndata loss or cause your system to crash.\n\n");

audacity.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Apr 24 21:35:43 UTC 2016 - sor.alexei@meowr.ru
+
+- Add audacity-2.1.1-fix-tempdir.patch from upstream: fix usage of
+  custom temp directories (boo#976964).
+
 -------------------------------------------------------------------
 Sun Oct 25 11:08:54 UTC 2015 - sor.alexei@meowr.ru
 

audacity.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package audacity
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,6 @@
 
 %define _use_internal_dependency_generator 0
 %define __find_requires %{wx_requires}
-%bcond_with restricted
 %bcond_with mad
 %bcond_with lame
 %bcond_with twolame
@@ -40,6 +39,8 @@ Patch1:         %{name}-flac_assert.h.patch
 Patch2:         %{name}-fix-nonsense.patch
 # PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf@opensuse.org -- Patch to compile with latest ffmpeg.
 Patch3:         %{name}-ffmpeg.patch
+# PATCH-FIX-UPSTREAM audacity-2.1.1-fix-tempdir.patch boo#976964 -- Fix usage of custom temp directories (commit 2a6d423).
+Patch4:         %{name}-2.1.1-fix-tempdir.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
@@ -54,6 +55,9 @@ BuildRequires:  pkgconfig(flac++)
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4.0
 BuildRequires:  pkgconfig(id3tag)
 BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libavcodec) >= 51.53
+BuildRequires:  pkgconfig(libavformat) >= 52.12
+BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(sndfile)
@@ -70,11 +74,6 @@ Recommends:     libavcodec
 Recommends:     libavformat
 Recommends:     libavutil
 Recommends:     libmp3lame0
-%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) || %{with restricted}
-BuildRequires:  pkgconfig(libavcodec) >= 51.53
-BuildRequires:  pkgconfig(libavformat) >= 52.12
-BuildRequires:  pkgconfig(libavutil)
-%endif
 %if %{with mad}
 BuildRequires:  pkgconfig(mad)
 %endif
@@ -100,9 +99,10 @@ than the physical memory size of your computer.
 %patch1 -p1
 %patch2 -p1
 %patch3
+%patch4 -p1
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
-rm -rf lib-src/{expat,libvamp,libsoxr}/
+rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/
 %if %{with lame}
 rm -rf lib-src/lame/
 %endif