The package rpms/bletchmame.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/bletchmame.git/commit/?id=5c55f16....
Change:
+%ifarch armv7hl i686 s390x
Thanks.
Full change:
============
commit 5c55f16e65a43e7f7f068ab84a4c6ae27c79a120
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sat Mar 26 15:54:35 2022 -0700
Update to 2.14; Fixes: RHBZ#2068762
diff --git a/.gitignore b/.gitignore
index 2ab8e76..453f2cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/bletchmame-2.11.tar.gz
/bletchmame-2.12.tar.gz
/bletchmame-2.13.tar.gz
+/bletchmame-2.14.tar.gz
diff --git a/322.patch b/322.patch
deleted file mode 100644
index d3b86ff..0000000
--- a/322.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ee99c84784eb29f9bcc4f049009b3e8ed1583578 Mon Sep 17 00:00:00 2001
-From: Davide Cavalca <davide(a)cavalca.name>
-Date: Sat, 26 Feb 2022 08:41:58 -0800
-Subject: [PATCH] Fix include path when doing an out-of-tree build
-
----
- CMakeLists.txt | 4 ++--
- scripts/bletchmame_build_msvc2019.sh | 4 ++--
- scripts/bletchmame_build_msys2.sh | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c8e9915..0d02f1b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -254,7 +254,7 @@ add_library(BletchMAME_core
- src/dialogs/switches.h
- ${TS_FILES}
- )
--target_include_directories(BletchMAME_core PRIVATE src lib
${CMAKE_CURRENT_BINARY_DIR}/include)
-+target_include_directories(BletchMAME_core PRIVATE src lib ${CMAKE_SOURCE_DIR}/include)
- target_link_libraries(BletchMAME_core PRIVATE Qt6::Widgets ${QUAZIP_LIBRARIES}
Qt6::Core5Compat ${ZLIB_LIBRARIES})
-
-
-@@ -263,7 +263,7 @@ target_link_libraries(BletchMAME_core PRIVATE Qt6::Widgets
${QUAZIP_LIBRARIES} Q
- #############################################################################
-
- add_executable(BletchMAME WIN32 src/main.cpp src/resources.qrc src/winresources.rc)
--target_include_directories(BletchMAME PRIVATE src lib
${CMAKE_CURRENT_BINARY_DIR}/include)
-+target_include_directories(BletchMAME PRIVATE src lib ${CMAKE_SOURCE_DIR}/include)
- target_link_libraries(BletchMAME PRIVATE BletchMAME_core Qt6::Widgets
${QUAZIP_LIBRARIES} Qt6::Core5Compat ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
- install(TARGETS BletchMAME RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-diff --git a/scripts/bletchmame_build_msvc2019.sh b/scripts/bletchmame_build_msvc2019.sh
-index ecbcc4f..5b3db03 100644
---- a/scripts/bletchmame_build_msvc2019.sh
-+++ b/scripts/bletchmame_build_msvc2019.sh
-@@ -78,8 +78,8 @@ cmake -S. -B${BLETCHMAME_BUILD_DIR} \
- -DCMAKE_INCLUDE_PATH=$DEPS_INSTALL_DIR/include
-
- # generate version.gen.h
--mkdir -p ${BLETCHMAME_BUILD_DIR}/include
--git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_BUILD_DIR}/include/version.gen.h
-+mkdir -p ${BLETCHMAME_DIR}/include
-+git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_DIR}/include/version.gen.h
-
- # and build!
- cmake --build ${BLETCHMAME_BUILD_DIR} --parallel --config ${CONFIG}
-diff --git a/scripts/bletchmame_build_msys2.sh b/scripts/bletchmame_build_msys2.sh
-index 281a8fe..060c241 100644
---- a/scripts/bletchmame_build_msys2.sh
-+++ b/scripts/bletchmame_build_msys2.sh
-@@ -51,8 +51,8 @@ cmake -S. -B${BLETCHMAME_BUILD_DIR} \
- -DQuaZip-Qt6_DIR=${DEPS_INSTALL_DIR}/lib/cmake/QuaZip-Qt6-1.1
-
- # generate version.gen.h
--mkdir -p ${BLETCHMAME_BUILD_DIR}/include
--git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_BUILD_DIR}/include/version.gen.h
-+mkdir -p ${BLETCHMAME_DIR}/include
-+git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_DIR}/include/version.gen.h
-
- # and build!
- cmake --build ${BLETCHMAME_BUILD_DIR} --parallel
diff --git a/README.fedora b/README.fedora
index fcd7341..887c8b1 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,8 +1,3 @@
-BletchMAME will not work properly if MAME is setup to use the opengl video
-driver, which is the default on Fedora. Comment out the "video opengl" entry
-in /etc/mame/mame.ini if you encounter issues. This issue is tracked upstream
-in
https://github.com/npwoods/bletchmame/issues/130.
-
If you have trouble getting machines to receive input correctly, try switching
to full screen and back (e.g. by pressing F11). This issue is tracked upstream
in
https://github.com/npwoods/bletchmame/issues/295.
diff --git a/bletchmame.spec b/bletchmame.spec
index e70781c..d511709 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -1,7 +1,7 @@
%global forgeurl
https://github.com/npwoods/bletchmame
Name: bletchmame
-Version: 2.13
+Version: 2.14
Release: %autorelease
Summary: MAME emulator frontend
@@ -14,12 +14,6 @@ Patch0: bletchmame-default-paths.patch
# Disable broken tests on 32 bit architectures
#
https://github.com/npwoods/bletchmame/issues/256
Patch1: bletchmame-disable-broken-tests.patch
-# Fix include path when doing an out-of-tree build
-Patch2: %{forgeurl}/pull/322.patch
-
-# Temporarily disable due to missing dependencies
-#
https://bugzilla.redhat.com/show_bug.cgi?id=2012824
-ExcludeArch: s390x
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -51,10 +45,9 @@ emulation.
%setup -q
%patch0 -p1
# Disable broken tests on 32 bit architectures
-%ifarch armv7hl i686
+%ifarch armv7hl i686 s390x
%patch1 -p1
%endif
-%patch2 -p1
cp -p %{SOURCE1} .
diff --git a/sources b/sources
index 836f46d..4ab1df3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bletchmame-2.13.tar.gz) =
600d1efa1624e6d7e3c4738173805a9db7968fce35a661de305446e2663a1aa3cf02e10881b88d2540473bc2972d7e80402a8b6643c8fae282fb57332ea23939
+SHA512 (bletchmame-2.14.tar.gz) =
94e2ffb6d805ea92817e23578c4d3dcd78436c32b99965ad6ed20331ebdcb6bacbcde09288484d92acfa92c81b9a80a4ec1d400abc26ed1c12142ebcbd91fcb2