.gitignore

@@ -16,7 +16,3 @@
 /visualboyadvance-m-2.1.7.tar.gz
 /visualboyadvance-m-2.1.8.tar.gz
 /visualboyadvance-m-2.1.9.tar.gz
-/visualboyadvance-m-2.1.10.tar.gz
-/visualboyadvance-m-2.1.11.tar.gz
-/visualboyadvance-m-2.2.0.tar.gz
-/visualboyadvance-m-2.2.2.tar.gz

sources

@@ -1 +1 @@
-SHA512 (visualboyadvance-m-2.2.2.tar.gz) = 1568a31ff3b06f44202f71f56b42bd734b87da58bdd8e521f8b3ab919da56441a10588460733f823108b5532d3b39f1d05a9f5b0956b4ada36c87e8433b31954
+SHA512 (visualboyadvance-m-2.1.9.tar.gz) = de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6

visualboyadvance-m.spec

@@ -1,18 +1,15 @@
 %undefine _hardened_build
-#Needed for bundled SFML
-%undefine _cmake_shared_libs
 
 %global shortname vbam
 
 Name:           visualboyadvance-m
-Version:        2.2.2
+Version:        2.1.9
 Release:        %autorelease
 Summary:        High compatibility Gameboy Advance Emulator combining VBA builds
 
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License:        GPL-2.0-only
-Url:            https://github.com/visualboyadvance-m/visualboyadvance-m
-Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+License:        GPLv2
+Url:            http://www.vba-m.com
+Source0:        https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -25,7 +22,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  nasm
 BuildRequires:  openal-soft-devel
 BuildRequires:  SDL2-devel
-#BuildRequires:  SFML-devel
+BuildRequires:  SFML-devel
 BuildRequires:  wxGTK-devel
 BuildRequires:  zlib-devel
 BuildRequires:  zip
@@ -37,11 +34,8 @@ BuildRequires:  libappstream-glib
 
 Requires:  hicolor-icon-theme
 
-#TODO remove when SFML is updated in fedora
-Provides:       bundled(SFML) = 3.1.0
-
-# 32bit package serves very little purpose, s390x has build issues:
-ExcludeArch: %{ix86} s390x
+# 32bit package serves very little purpose:
+ExcludeArch: %{ix86}
 
 #Using info from here: http://vba-m.com/about.html and debian files
 %description
@@ -67,11 +61,6 @@ Advance project, with many improvements from various developments of VBA.
 sed -i 's/ -mtune=generic//g' CMakeLists.txt
 #Some odd permission issues:
 chmod -x src/wx/rpi.h
-#TODO Remove bundled sfml when updated in fedora to 3.0
-#rm -rf third_party/sfml
-#sed -i "/third_party\/sfml/d" CMakeLists.txt
-#sed -i "s|[./]*third_party/sfml/include/||" \
-#    src/core/gba/gbaLink.cpp src/core/gba/internal/gbaSockClient.h
 
 %build
 %cmake \
@@ -81,7 +70,6 @@ chmod -x src/wx/rpi.h
     -DENABLE_SDL=ON \
     -DENABLE_WX=ON \
     -DENABLE_FFMPEG=OFF \
-    -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
     -DENABLE_LINK=ON
 %cmake_build