[libopenshot/el7: 3/3] Merge branch 'master' into el7
commit 1054a2964bac983643faa0f02b716a74a4a49748
Merge: 6051200 7ed0931
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Wed Sep 18 21:53:18 2019 -0400
Merge branch 'master' into el7
.gitignore | 1 +
libopenshot-fix-tests.patch | 60 -------------------------------------
libopenshot-fix_swig_variable.patch | 22 --------------
libopenshot-py-install-path.patch | 60 +++++++++++++++++++++++++++++++++++++
libopenshot.spec | 31 +++++++++++++++----
sources | 2 +-
6 files changed, 87 insertions(+), 89 deletions(-)
---
diff --cc libopenshot.spec
index 8351bf0,3a6a159..667cb01
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@@ -112,10 -119,15 +122,19 @@@ make os_tes
%changelog
+ * Mon Sep 16 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.3-4
+ - Update to git HEAD for compatibility with OpenShot update
+ - Enable unit tests
+ - Remove CMAKE_SKIP_RPATH to make test binaries runnable from build dir
+ - Delete outdated copy of standard CMake module, causes python3.8 failures
+
+ * Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com> -
0.2.3-3.20190406git101f25a
+ - Rebuild for new ffmpeg version
+
+* Sun Jun 23 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.3-3
+- Add explicit Requires: zeromq, to work around other EL7
+ packages which provide the required libzmq.so.5
+
* Tue Apr 09 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.3-2
- Upgrade to latest git revision, to fix FTBFS with GCC9 on Fedora 30
- Requires libopenshot-audio also built from same or later gitrev