[libopenshot/el7: 24/24] Sync with master
commit 9b366257e867940845260a3fa9362b5d90c1ed1f
Merge: 1a89b50 6950fed
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Nov 21 16:30:14 2017 -0600
Sync with master
.gitignore | 8 +++++
libopenshot.spec | 91 +++++++++++++++++++++++++++++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 89 insertions(+), 12 deletions(-)
---
diff --cc libopenshot.spec
index 6348809,4c842be..a985809
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@@ -75,5 -79,69 +79,70 @@@ export CXXFLAGS="%{optflags} -Wl,--as-n
%changelog
+ * Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.8-2
+ - Rebuild for ffmpeg update
+
+ * Thu Sep 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.8-1
+ - Update libopenshot to 0.1.8
+
+ * Sat Sep 02 2017 Sérgio Basto <sergio(a)serjux.com> - 0.1.7-1
+ - Update libopenshot to 0.1.7
+ - Fix compilation with GCC 7 by adding -Wno-error, reference
+ https://github.com/monocasual/giada/issues/139
+
+ * Sun Aug 27 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.6-2
+ - Rebuilt for ImageMagick
+
+ * Fri May 19 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.6-1
+ - Update to latest upstream release.
+
+ * Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.4-2
+ - Rebuild for ffmpeg update
+
+ * Thu Apr 06 2017 Sérgio Basto <sergio(a)serjux.com> - 0.1.4-1
+ - Update to 0.1.4
+
+ * Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> -
0.1.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+ * Tue Mar 14 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.3-1
+ - Update to latest upstream release.
+
+ * Mon Oct 17 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.2-1
+ - Update to latest upstream release.
+
+ * Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.1.1-3
+ - Rebuilt for ffmpeg-3.1.1
+
+ * Mon Apr 18 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.1-2
+ - Rename python-libopenshot to python3-libopenshot.
+
+ * Fri Apr 8 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.1-1
+ - Update to latest upstream release.
+
+ * Tue Feb 9 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.1.0-1
+ - Update to latest upstream release.
+
+ * Mon Nov 16 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.0.6-1
+ - Update to latest upstream release.
+
+ * Wed Jun 24 2015 Sérgio Basto <sergio(a)serjux.com> - 0.0.4-2
+ - Fixed unused-direct-shlib-dependency in cmake with global optflags,
+ instead use "export CXXFLAGS" that was override all flags .
+
+ * Mon May 18 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.0.4-1
+ - New upstream release 0.0.4
+ - Fix FTBFS (rf#3624)
+
+ * Mon Oct 20 2014 Sérgio Basto <sergio(a)serjux.com> - 0.0.3-4
+ - Rebuilt for FFmpeg 2.4.3
+
+ * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.3-3
+ - Rebuilt for FFmpeg 2.4.x
+
+ * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.3-2
+ - Rebuilt for FFmpeg 2.4.x
+
++>>>>>>> master
* Tue Jul 15 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.0.3-1
- Initial packaging.