Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2016-04-28 16:56:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacity" Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2015-10-26 12:49:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2016-04-28 17:01:16.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 24 21:35:43 UTC 2016 - sor.ale...@meowr.ru + +- Add audacity-2.1.1-fix-tempdir.patch from upstream: fix usage of + custom temp directories (boo#976964). + +------------------------------------------------------------------- New: ---- audacity-2.1.1-fix-tempdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Hy1Gya/_old 2016-04-28 17:01:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Hy1Gya/_new 2016-04-28 17:01:20.000000000 +0200 @@ -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 @@ Patch2: %{name}-fix-nonsense.patch # PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddw...@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(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: 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 @@ %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 ++++++ audacity-2.1.1-fix-tempdir.patch ++++++ --- 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");