2:38 a.m.
commit 36e726698b848e27325a8b2ccd7fdead0264e4aa
Author: Jeremy <alexjnewt(a)hotmail.com>
Date: Fri Jun 24 16:53:58 2016 -0400
Update to 5.0
.gitignore | 4 +-
dolphin-emu-5.0-gtest.patch | 20 -
dolphin-emu-5.0-gtk3.patch | 2 +-
dolphin-emu-5.0-mbedtls.patch | 857 ------------------------------------------
dolphin-emu.spec | 29 +-
sources | 4 +-
6 files changed, 9 insertions(+), 907 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 34d8120..153de6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-5.0-rc.tar.gz
-dolphin-emu.6
-dolphin-emu-nogui.6
+5.0.tar.gz
diff --git a/dolphin-emu-5.0-gtk3.patch b/dolphin-emu-5.0-gtk3.patch
index 0d6dc09..3e7d82f 100644
--- a/dolphin-emu-5.0-gtk3.patch
+++ b/dolphin-emu-5.0-gtk3.patch
@@ -16,7 +16,7 @@
- message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK
development libraries.")
- endif()
- endif()
-+
++
+ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
+ include_directories(${GTK3_INCLUDE_DIRS})
+ list(APPEND LIBS ${GTK3_LIBRARIES})
diff --git a/dolphin-emu.spec b/dolphin-emu.spec
index 60f6ccf..f17b036 100644
--- a/dolphin-emu.spec
+++ b/dolphin-emu.spec
@@ -1,29 +1,15 @@
%undefine _hardened_build
-#Git commit hash for manpages
-%global mpcommit 84483a1076710666109bea3b4254b01e9d9f6f6b
Name: dolphin-emu
Version: 5.0
-Release: 0.2rc%{?dist}
+Release: 1%{?dist}
Summary: GameCube / Wii / Triforce Emulator
Url: http://dolphin-emu.org/
License: GPLv2 and BSD and Public Domain
-Source0: https://github.com/%{name}/dolphin/archive/5.0-rc.tar.gz
-#Grab the current manpages from upstream (will be added for 5.0):
-Source1:
https://raw.githubusercontent.com/%{name}/dolphin/%{mpcommit}/Data/%{name}.6
-Source2:
https://raw.githubusercontent.com/%{name}/dolphin/%{mpcommit}/Data/%{name...
+Source0: https://github.com/%{name}/dolphin/archive/%{version}.tar.gz
#GTK3 patch, upstream doesn't care for gtk3
Patch0: %{name}-%{version}-gtk3.patch
-#Patch to enable use of shared gtest
-#https://bugs.dolphin-emu.org/issues/9402
-Patch1: %{name}-%{version}-gtest.patch
-#Patch for mbedtls instead of polarssl
-#Fixed upstream, patch is based on these 3 commits:
-#https://github.com/Tilka/dolphin/commit/063446c46ff743d458b43025056bd01988b57ff6
-#https://github.com/Tilka/dolphin/commit/f6795466e767ee11e3f2c7d93c8f51abeabd29af
-#https://github.com/sepalani/dolphin/commit/5be64d39b0ab463edc286e789d21ebefa62cbaa7
-Patch2: %{name}-%{version}-mbedtls.patch
BuildRequires: alsa-lib-devel
BuildRequires: bluez-libs-devel
@@ -81,10 +67,8 @@ Dolphin Emulator without a graphical user interface
####################################################
%prep
-%setup -q -n dolphin-%{version}-rc
+%setup -q -n dolphin-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
#Fix an rpmlint warning:
sed -i "/#!/d" Installer/%{name}.desktop
@@ -113,10 +97,6 @@ make %{?_smp_mflags} install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-#Install manpages:
-install -p -D -m 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man6/%{name}.6
-install -p -D -m 0644 %{SOURCE2} %{buildroot}/%{_mandir}/man6/%{name}-nogui.6
-
%find_lang %{name}
%files -f %{name}.lang
@@ -145,6 +125,9 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Jun 24 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 5.0-1
+- Update to 5.0
+
* Thu Mar 24 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 5.0-0.2rc
- Update manpages to upstream
- Disable hardened build (breaks dolphin)
diff --git a/sources b/sources
index bacf69e..1b18244 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-4b1fa4bbf917bdebf39e710ca214b873 5.0-rc.tar.gz
-9de3de24aa34b67c1eb48a981edef625 dolphin-emu.6
-8c7a0fe1a788d26a653415b375f23bc9 dolphin-emu-nogui.6
+ed94272956adbec690808f6e4d8ff065 5.0.tar.gz