The package rpms/audacity.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/audacity.git/commit/?id=db064c4ca....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit db064c4ca14ce986b05797ba7967b055aba14751
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Wed Mar 17 10:19:36 2021 -0500
Exclude s390x, not supported upstream.
diff --git a/audacity.spec b/audacity.spec
index e9fd377..4ba638b 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -82,6 +82,7 @@ BuildRequires: ffmpeg-devel
# For new symbols in portaudio
Requires: portaudio%{?_isa} >= 19-16
+ExcludeArch: s390x
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
commit 8ceb5df6f6a0b80094fc4b21e5190b9ee6bddcf7
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Wed Mar 17 09:54:03 2021 -0500
3.0.0
diff --git a/.gitignore b/.gitignore
index 0ddec72..b323525 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/audacity-manual-2.3.3.zip
/audacity-minsrc-2.4.2.tar.xz
/audacity-manual-2.4.2.zip
+/audacity-minsrc-3.0.0.tar.xz
+/audacity-manual-3.0.0.zip
diff --git a/audacity.spec b/audacity.spec
index 4145682..e9fd377 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -8,8 +8,8 @@
Name: audacity
-Version: 2.4.2
-Release: 4%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
URL:
http://audacity.sourceforge.net
@@ -24,6 +24,8 @@ Source0:
http://www.fosshub.com/Audacity.html/%{name}-minsrc-%{version}.tar.xz
Source1:
http://www.fosshub.com/Audacity.html/%{name}-manual-%{version}.zip
+Patch0: system-wx.patch
+
BuildRequires: cmake
BuildRequires: gettext-devel
@@ -67,7 +69,7 @@ BuildRequires: python3
#endif
# But we will actually use the --toolkit=gtk2 version using --with-wx-version
#BuildRequires: compat-wxGTK3-gtk2-devel
-BuildRequires: wxGTK3-devel
+BuildRequires: wxGTK-devel
%if 0%{?rhel} >= 8 || 0%{?fedora}
BuildRequires: libappstream-glib
%endif
@@ -103,6 +105,8 @@ For the most up to date manual content, use the on-line manual.
%prep
%setup -q -n %{tartopdir}
+%patch0 -p0
+
%build
%if 0%{?rhel} == 7
export WX_CONFIG=wx-config-3.0
@@ -217,6 +221,9 @@ rm %{buildroot}%{_datadir}/doc/%{name}/LICENSE.txt
%changelog
+* Wed Mar 17 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 3.0.0-1
+- 3.0.0
+
* Thu Feb 11 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 2.4.2-4
- Use system for lv2 and midi.
diff --git a/sources b/sources
index 107e35b..c039a71 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (audacity-minsrc-2.4.2.tar.xz) =
0fcbb2d9e131b3d683b3f0b0d16f565f034d46e57dab1749c52fc8e72f2bc8c64606fd749ed13d925aecef31f38258ad8b79f8e1baa23c99c7b805686e5445b4
-SHA512 (audacity-manual-2.4.2.zip) =
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
+SHA512 (audacity-minsrc-3.0.0.tar.xz) =
4443c0ba6c2bdd067a9d84cf1b80f740df9c6f83a91d2b965e09c69e007d9d79db93762f488881c9a5a7ef4a59d3e6314062ca40d791f4191ad353497fe0fb32
+SHA512 (audacity-manual-3.0.0.zip) =
538f60493844395be49dd385be721ca2960d23e7f1d9d8c554f369591d1c3d0a09bb80664b48ca2ef1b0ae12cc358b65742e8015dad7719d55c19161979cca90
diff --git a/system-wx.patch b/system-wx.patch
new file mode 100644
index 0000000..eed2445
--- /dev/null
+++ b/system-wx.patch
@@ -0,0 +1,29 @@
+--- cmake-proxies/wxWidgets/CMakeLists.txt~ 2020-08-05 11:32:53.000000000 -0500
++++ cmake-proxies/wxWidgets/CMakeLists.txt 2021-03-17 08:41:56.880061383 -0500
+@@ -237,16 +237,16 @@
+ "^#define +wxVERSION_STRING +"
+ )
+
+-string( REGEX MATCHALL "\".+(Audacity).+\"" ours
"${output}")
+-if( NOT ours )
+- message( FATAL_ERROR
+-
"\n########################################################################\n"
+- "Audacity version 3.0.0 or higher requires use of a customized version of
"
+- "wxWidgets. For details:\n"
+- "
https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
+-
"########################################################################\n"
+- )
+-endif()
++#string( REGEX MATCHALL "\".+(Audacity).+\"" ours
"${output}")
++#if( NOT ours )
++# message( FATAL_ERROR
++#
"\n########################################################################\n"
++# "Audacity version 3.0.0 or higher requires use of a customized version of
"
++# "wxWidgets. For details:\n"
++# "
https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
++#
"########################################################################\n"
++# )
++#endif()
+
+ target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
+ target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )