From 6457a7a6d1fd6f9bb9e4466ebd57595c2e2dbc27 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Tue, 18 Apr 2017 21:44:17 +0200 Subject: [PATCH] Problem with patching fixed. New version for makemkv --- fedora/SPECS/kodi.spec | 23 +++++++++++++++++++++-- fedora/SPECS/makemkv.spec | 14 ++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 4b1828c..ad4425f 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -1,12 +1,14 @@ #global PRERELEASE rc1 -%global DIRVERSION %{version} +%global myversion 17.1 +%global DIRVERSION %{myversion} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases #global DIRVERSION %{version}%{PRERELEASE} %global _hardened_build 1 +%define debug_package %{nil} Name: kodi -Version: 17.0b5 +Version: %myversion Release: 1%{?dist} Summary: Media center @@ -41,6 +43,7 @@ Patch5: ffmpeg-2.9.patch Patch6: gcc6.patch Patch7: kodi-avicodec.patch +Patch8: kodi-AEDefines_disable.patch # Optional deps (not in EPEL) %if 0%{?fedora} @@ -259,6 +262,7 @@ library. #%patch6 -p1 #%endif %patch7 +%patch8 %build @@ -412,6 +416,21 @@ fi %changelog +* Sat Feb 25 2017 Daniel Steiner +- Update to Krypton 17.1rc1 + +* Wed Feb 8 2017 Daniel Steiner +- Update to Krypton Final + +* Sun Jan 29 2017 Daniel Steiner +- Update to Krypton RC 4 + +* Sat Jan 14 2017 Daniel Steiner +- Update to Krypton RC 3 + +* Sat Dec 3 2016 Daniel Steiner +- Update to Krypton Beta6 + * Fri Nov 25 2016 Daniel Steiner - Update to Krypton Beta5, built on Fedora 25 diff --git a/fedora/SPECS/makemkv.spec b/fedora/SPECS/makemkv.spec index 8dcf7a3..958e01b 100644 --- a/fedora/SPECS/makemkv.spec +++ b/fedora/SPECS/makemkv.spec @@ -3,13 +3,13 @@ # Name: makemkv -Version: 1.10.4 +Version: 1.10.5 Release: 0%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: One click DVD and Blu-ray converter -Url: http://www.makemkv.com -Source0: %{name}-oss-%{version}.tar.gz -Source1: %{name}-bin-%{version}.tar.gz +Url: http://www.makemkv.com/download/ +Source0: http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz +Source1: http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz # patch to disable the eula asking (interactive!) Source2: makemkv_eula.patch License: Comercial @@ -61,7 +61,9 @@ Attention: To make it work, you need rpmfusion-free-updates repository configure pushd %{_builddir} tar xzf %{S:1} -patch -p0 < %{S:2} +popd +pushd %{_builddir}/%{name}-bin-%{version} +patch -p1 < %{S:2} popd %install @@ -75,7 +77,7 @@ popd %files %defattr(-,root,root,-) %{_bindir}/* -%{_prefix}/lib/* +%{_libdir}/* %{_datarootdir}/icons/hicolor/*/apps/makemkv.png %{_datarootdir}/applications/makemkv.desktop %{_datarootdir}/MakeMKV/*