diff --git a/.gitignore b/.gitignore index 47dded8..3b68301 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /pcsxr-87788.zip /pcsxr-7ce3857.tar.gz /pcsxr-62467b8.tar.gz -/pcsxr-73370c9.tar.gz diff --git a/pcsxr.spec b/pcsxr.spec index fee4038..674ef7e 100644 --- a/pcsxr.spec +++ b/pcsxr.spec @@ -1,11 +1,11 @@ -%global commit 73370c9af48df72cffd4adf5f81156955f96f0dd +%global commit 62467b86871aee3d70c7445f3cb79f0858ec566e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20200505 +%global gitdate 20190306 %global fgittag %{gitdate}.git%{shortcommit} %undefine _hardened_build Name: pcsxr Version: 1.9.94 -Release: 23%{?fgittag:.%{fgittag}}%{?dist} +Release: 22%{?fgittag:.%{fgittag}}%{?dist} Summary: A plugin based PlayStation (PSX) emulator with high compatibility #All code is distributed as GPLv3+ except: @@ -13,8 +13,8 @@ Summary: A plugin based PlayStation (PSX) emulator with high compatibilit # SOURCE/libpcsxcore/sjisfont.h is Public Domain # SOURCE/libpcsxcore/psemu_plugin_defs.h is Public Domain License: GPLv3+ and BSD and Public Domain -Url: https://github.com/MaddTheSane/PCSX-Reloaded -Source0: https://github.com/MaddTheSane/PCSX-Reloaded/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Url: https://github.com/iCatButler/pcsxr +Source0: https://github.com/iCatButler/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz #Appdata: Source1: %{name}.appdata.xml #This is a hack to get it to build @@ -58,7 +58,7 @@ emulation support for game pads, videos, sound, memory cards, and other important PSX components, and is able to play many games without problems. %prep -%autosetup -p1 -n PCSX-Reloaded-%{commit} +%autosetup -p1 -n %{name}-%{commit} #remove any unnecessary files: rm -f -r win32 macosx #Remove changes to c/cxx flags, upstream strips out debug symbols @@ -69,9 +69,7 @@ sed -i '/COPYING/d' doc/CMakeLists.txt sed -i 's/"git"/"%{fgittag}"/' gui/AboutDlg.c %build -%cmake . -DUSE_LIBCDIO:BOOL=ON -DUSE_LIBARCHIVE:BOOL=ON \ - -DCMAKE_EXE_LINKER_FLAGS="-zmuldefs -fno-pie" \ - -DCMAKE_MODULE_LINKER_FLAGS="-zmuldefs" +%cmake . -DUSE_LIBCDIO:BOOL=ON -DUSE_LIBARCHIVE:BOOL=ON %make_build %install @@ -96,10 +94,6 @@ appstream-util validate-relax --nonet \ %{_datadir}/icons/hicolor/*/apps/%{name}-icon.png %changelog -* Sat May 16 2020 Jeremy Newton - 1.9.94-23.20200505.git73370c9 -- Update to new git tree -- Fix build - * Tue Mar 31 2020 Adrian Reber - 1.9.94-22.20190306.git62467b8 - Rebuilt for libcdio-2.1.0 diff --git a/sources b/sources index 65bca48..fe68bdd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcsxr-73370c9.tar.gz) = a0b6a6c2faa3c55f21235da6dccd2afd31921288409c34d3ceaf2d45a089f543343401a7ea706dddac4d575a0b2b90f0a8053012ff5f95dd98391584102c4cc2 +SHA512 (pcsxr-62467b8.tar.gz) = 894e795c3616bb6abf87d144e1a2409142d457f2f2c04c4287e2804bb06caf008f42501089d555b5e43e6b2d6d2e8ac9a7d78842bed975b1b4b94465f4ed3a3c