Merge branch 'makemkv-bump' into 'master'

Makemkv 1.14.7

See merge request bgstack15/stackrpms!102

6 files changed, 24 insertions, 9 deletions

diff --git a/makemkv/README.md b/makemkv/README.md
index 8b1dc8b..58c49db 100644
--- a/makemkv/README.md
+++ b/makemkv/README.md
@@ -4,11 +4,12 @@ https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053
 
 # Reason for being in stackrpms
 Fedora does not package makemkv because it is only partially open-source. I do not want to depend on external repos too much. I also include some logic for always being able to run makemkv.
+As of makemkv 1.14.7, I am diverging from negativo17's spec file.
 
 # Reverse dependency matrix
 Distro     | makemkv version
 ---------- | ---------------
-All        | 1.14.5
+All        | 1.14.7
 
 # Differences from upstream
-See file [stackrpms-makemkv.spec.diff](stackrpms-makemkv.spec.diff)
+See file [stackrpms-makemkv.spec.diff](stackrpms-makemkv.spec.diff) which was last applied on version 1.14.5.
diff --git a/makemkv/changelog.txt b/makemkv/changelog.txt
index 22c0f2a..39aaebb 100644
--- a/makemkv/changelog.txt
+++ b/makemkv/changelog.txt
@@ -1,5 +1,16 @@
 Revision history
 
+MakeMKV v1.14.7 ( 4.12.2019 )
+
+    Bug fixes:
+        Better compatibility for decrypted AACS 2.1 FMTS files
+        Fixed variable expansion bug for default file name template
+
+MakeMKV v1.14.6 ( 2.12.2019 )
+
+    Added support for AACS 2.1
+    Many small bugfixes and improvements
+
 MakeMKV v1.14.5 ( 9.6.2019 )
 
     Some small miscellaneous improvements
diff --git a/makemkv/makemkv-bin-1.14.5.tar.gz b/makemkv/makemkv-bin-1.14.5.tar.gz
deleted file mode 100644
index 1461179..0000000
--- a/makemkv/makemkv-bin-1.14.5.tar.gz
+++ /dev/null
diff --git a/makemkv/makemkv-oss-1.14.5.tar.gz b/makemkv/makemkv-oss-1.14.5.tar.gz
deleted file mode 100644
index e4ee323..0000000
--- a/makemkv/makemkv-oss-1.14.5.tar.gz
+++ /dev/null
diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec
index db40955..fd83dd6 100644
--- a/makemkv/makemkv.spec
+++ b/makemkv/makemkv.spec
@@ -13,17 +13,17 @@
 
 Summary:        DVD and Blu-ray to MKV converter and network streamer
 Name:           makemkv
-Version:        1.14.5
+Version:        1.14.7
 Release:        10%{?dist}
 License:        GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+
 URL:            http://www.%{name}.com/
 ExclusiveArch:  %{ix86} x86_64
 
-Source0:        http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz
-Source1:        http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz
+Source0:        https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz
+Source1:        https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz
 Source2:        changelog.txt
 Source3:        %{name}.appdata.xml
-Source4:        http://www.%{name}.com/developers/usage.txt#/%{name}con.txt
+Source4:        https://www.%{name}.com/developers/usage.txt#/%{name}con.txt
 Source5:        %{name}-wrapper
 Source6:        settings.conf.example
 
@@ -151,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libmmbd.so.0
 
 %changelog
+* Wed Dec 04 2019 B Stack <bgstack15@gmail.com> - 1.14.7-10
+- Update
+
 * Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.14.5-10
 - Add stackrpms customizations
 
diff --git a/makemkv/settings.conf.example b/makemkv/settings.conf.example
index c223f5b..018aba6 100644
--- a/makemkv/settings.conf.example
+++ b/makemkv/settings.conf.example
@@ -1,11 +1,11 @@
 #
-# MakeMKV settings file, written by MakeMKV v1.14.5 linux(x64-release)
-# suitable for version 1.14.5, expires 2019-11-31
+# MakeMKV settings file, written by MakeMKV v1.14.7 linux(x64-release)
+# suitable for version 1.14.7, expires 2020-01-31
 
 app_DestinationDir = ""
 app_InterfaceLanguage = "eng"
 app_Java = ""
-app_Key = "T-2541DIINav5@4EGGUu7241BvCfC4XgLo6D4oPhE2SeyupYYWNYkg_48BAZACI4LfyQ"
+app_Key = "T-a37dwZgouzYiNxPOnU4AbpRtCakD0UzdFPuHLnCfX2O2kshXG4KhC37lho7axaXvtZ"
 app_PreferredLanguage = "eng"
 app_ccextractor = ""