Problem with patching fixed. New version for makemkv

This commit is contained in:
2017-04-18 21:44:17 +02:00
parent f0e745617f
commit 6457a7a6d1
2 changed files with 29 additions and 8 deletions

View File

@@ -1,12 +1,14 @@
#global PRERELEASE rc1 #global PRERELEASE rc1
%global DIRVERSION %{version} %global myversion 17.1
%global DIRVERSION %{myversion}
#global GITCOMMIT Gotham_r2-ge988513 #global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases # use the line below for pre-releases
#global DIRVERSION %{version}%{PRERELEASE} #global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1 %global _hardened_build 1
%define debug_package %{nil}
Name: kodi Name: kodi
Version: 17.0b5 Version: %myversion
Release: 1%{?dist} Release: 1%{?dist}
Summary: Media center Summary: Media center
@@ -41,6 +43,7 @@ Patch5: ffmpeg-2.9.patch
Patch6: gcc6.patch Patch6: gcc6.patch
Patch7: kodi-avicodec.patch Patch7: kodi-avicodec.patch
Patch8: kodi-AEDefines_disable.patch
# Optional deps (not in EPEL) # Optional deps (not in EPEL)
%if 0%{?fedora} %if 0%{?fedora}
@@ -259,6 +262,7 @@ library.
#%patch6 -p1 #%patch6 -p1
#%endif #%endif
%patch7 %patch7
%patch8
%build %build
@@ -412,6 +416,21 @@ fi
%changelog %changelog
* Sat Feb 25 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton 17.1rc1
* Wed Feb 8 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Final
* Sun Jan 29 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton RC 4
* Sat Jan 14 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton RC 3
* Sat Dec 3 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta6
* Fri Nov 25 2016 Daniel Steiner <elpito@bluewin.ch> * Fri Nov 25 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta5, built on Fedora 25 - Update to Krypton Beta5, built on Fedora 25

View File

@@ -3,13 +3,13 @@
# #
Name: makemkv Name: makemkv
Version: 1.10.4 Version: 1.10.5
Release: 0%{?dist} Release: 0%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: One click DVD and Blu-ray converter Summary: One click DVD and Blu-ray converter
Url: http://www.makemkv.com Url: http://www.makemkv.com/download/
Source0: %{name}-oss-%{version}.tar.gz Source0: http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz
Source1: %{name}-bin-%{version}.tar.gz Source1: http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz
# patch to disable the eula asking (interactive!) # patch to disable the eula asking (interactive!)
Source2: makemkv_eula.patch Source2: makemkv_eula.patch
License: Comercial License: Comercial
@@ -61,7 +61,9 @@ Attention: To make it work, you need rpmfusion-free-updates repository configure
pushd %{_builddir} pushd %{_builddir}
tar xzf %{S:1} tar xzf %{S:1}
patch -p0 < %{S:2} popd
pushd %{_builddir}/%{name}-bin-%{version}
patch -p1 < %{S:2}
popd popd
%install %install
@@ -75,7 +77,7 @@ popd
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/* %{_bindir}/*
%{_prefix}/lib/* %{_libdir}/*
%{_datarootdir}/icons/hicolor/*/apps/makemkv.png %{_datarootdir}/icons/hicolor/*/apps/makemkv.png
%{_datarootdir}/applications/makemkv.desktop %{_datarootdir}/applications/makemkv.desktop
%{_datarootdir}/MakeMKV/* %{_datarootdir}/MakeMKV/*