[flowblade] Update to 1.10.0-1.git25c07ce
by Martin Gansser
commit afa053839d83e25b6a225290a4e61bc3bd328f74
Author: Martin Gansser <mgansser(a)alice.de>
Date: Thu Dec 15 21:44:26 2016 +0100
Update to 1.10.0-1.git25c07ce
.gitignore | 1 +
flowblade.spec | 15 ++++++++-------
sources | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 30eca1f..9231d6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/flowblade-1.6.0-c847b32.tar.gz
/flowblade-1.8.0-9365491.tar.gz
+/flowblade-1.10.0-9365491.tar.gz
diff --git a/flowblade.spec b/flowblade.spec
index 75f2c16..1f606fb 100644
--- a/flowblade.spec
+++ b/flowblade.spec
@@ -1,9 +1,9 @@
-# https://github.com/jliljebl/flowblade/commit/93654911b1123dc7395e87248136...
+# https://github.com/jliljebl/flowblade/commit/25c07cefdd21b1cd499be62f3330...
%global commit0 93654911b1123dc7395e87248136fd1cf19598b0
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: flowblade
-Version: 1.8.0
+Version: 1.10.0
Release: 1.git%{shortcommit0}%{?dist}
License: GPLv3
Summary: Multitrack non-linear video editor for Linux
@@ -14,12 +14,8 @@ Patch0: flowblade-001_sys_path.patch
BuildRequires: desktop-file-utils
BuildRequires: python2-devel
BuildRequires: python2-setuptools
-
-# Note to Martin (please delete next time you commit)
-# redo requires as they have changed
-# https://github.com/jliljebl/flowblade/blob/6327e9a49003ae931e92d0958c8695...
-Requires: ffmpeg
Requires: mlt-python
+Requires: mlt-freeworld
Requires: frei0r-plugins >= 1.4
Requires: gmic
Requires: gtk3
@@ -112,6 +108,11 @@ fi
%{python2_sitelib}/flowblade*
%changelog
+* Thu Dec 15 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.10.0-1.git25c07ce
+- Update to 1.10.0-1.git25c07ce
+- Dropped Requires ffmpeg
+- Add Requires mlt-freeworld
+
* Thu Sep 22 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.8.0-1.git9365491
- Update to 1.8.0-1.git9365491
diff --git a/sources b/sources
index 3584b9e..7068e4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78987bd1d9081d669f5f6c9e9e4702a0 flowblade-1.8.0-9365491.tar.gz
+78987bd1d9081d669f5f6c9e9e4702a0 flowblade-1.10.0-9365491.tar.gz
7 years, 11 months
[qt5-qtwebengine-freeworld] (5 commits) ...Merge branch 'master' into f25
by Kevin Kofler
Summary of changes:
da7205d... Initial import for F25 (*)
e80dd8f... Remove nonexistent qtwebengine-3rdparty.qdoc from %license (*)
c6a99a5... Revert "Remove nonexistent qtwebengine-3rdparty.qdoc from % (*)
5fc629e... Revert "Initial import for F25" (*)
6aa8f11... Merge branch 'master' into f25 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 11 months
[qt5-qtwebengine-freeworld/f25: 6/6] Merge branch 'master' into f25
by Kevin Kofler
commit 6aa8f1178478125f1c1ab94a876655943c0b5815
Merge: 5fc629e b53944c
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Thu Dec 15 10:17:15 2016 +0100
Merge branch 'master' into f25
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 601 +++
...pensource-src-5.6.0-beta-fix-extractcflag.patch | 12 +
...ne-opensource-src-5.6.0-beta-system-icu54.patch | 12 +
...engine-opensource-src-5.6.0-no-icudtl-dat.patch | 28 +
qtwebengine-opensource-src-5.7.0-linux-pri.patch | 26 +
qtwebengine-opensource-src-5.7.0-no-sse2.patch | 5154 ++++++++++++++++++++
...ngine-opensource-src-5.7.0-system-icu-utf.patch | 362 ++
...e-opensource-src-5.7.0-system-nspr-prtime.patch | 48 +
qtwebengine-opensource-src-5.7.0-webrtc-neon.patch | 21 +
qtwebengine-opensource-src-5.7.1-arm-fpu-fix.patch | 12 +
qtwebengine-opensource-src-5.7.1-no-neon.patch | 15 +
...gine-opensource-src-5.7.1-openmax-dl-neon.patch | 98 +
qtwebengine-opensource-src-5.7.1-skia-neon.patch | 15 +
...e-opensource-src-5.7.1-webrtc-neon-detect.patch | 159 +
sources | 1 +
16 files changed, 6565 insertions(+)
---
7 years, 11 months
[qt5-qtwebengine-freeworld/f25: 5/6] Revert "Initial import for F25"
by Kevin Kofler
commit 5fc629e7d5d2868ef39cb58687c398d31da62063
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Thu Dec 15 10:17:05 2016 +0100
Revert "Initial import for F25"
This reverts commit da7205ded36f60f640e2cf2f1287fb1c13a32cf8.
.gitignore | 1 -
qt5-qtwebengine-freeworld.spec | 567 ---
...pensource-src-5.6.0-beta-fix-extractcflag.patch | 12 -
...bengine-opensource-src-5.6.0-beta-no-neon.patch | 15 -
...ne-opensource-src-5.6.0-beta-system-icu54.patch | 12 -
...engine-opensource-src-5.6.0-no-icudtl-dat.patch | 28 -
qtwebengine-opensource-src-5.7.0-glibc224.patch | 33 -
qtwebengine-opensource-src-5.7.0-linux-pri.patch | 26 -
qtwebengine-opensource-src-5.7.0-no-sse2.patch | 5154 --------------------
...bengine-opensource-src-5.7.0-page-margins.patch | 40 -
...ngine-opensource-src-5.7.0-system-icu-utf.patch | 362 --
...e-opensource-src-5.7.0-system-nspr-prtime.patch | 48 -
qtwebengine-opensource-src-5.7.0-webrtc-neon.patch | 21 -
sources | 1 -
14 files changed, 6320 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b2b3d6..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-/qtwebengine-opensource-src-5.7.0.tar.xz
diff --git a/sources b/sources
index 16955fe..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-937f64886fbcb038d6fa4b44ae80cbeb qtwebengine-opensource-src-5.7.0.tar.xz
7 years, 11 months
[qt5-qtwebengine-freeworld/f25: 4/6] Revert "Remove nonexistent qtwebengine-3rdparty.qdoc from %license"
by Kevin Kofler
commit c6a99a587e90f92d8fbac73d5e3df3328727a737
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Thu Dec 15 10:16:58 2016 +0100
Revert "Remove nonexistent qtwebengine-3rdparty.qdoc from %license"
This reverts commit e80dd8f670db7fbf1458b126da7965e9758eefe3.
qt5-qtwebengine-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 39a038c..cab5a2c 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -360,7 +360,7 @@ echo "%{_libdir}/%{name}" \
%postun -p /sbin/ldconfig
%files
-%license LICENSE.*
+%license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc
%{_libdir}/%{name}/
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
7 years, 11 months
[qt5-qtwebengine-freeworld/f25] (6 commits) ...Merge branch 'master' into f25
by Kevin Kofler
Summary of changes:
7e6ba1b... Initial import (#4368). (*)
a5947ed... Respun tarball, change qt5-qtbase dependency from >= to = (*)
b53944c... Do not build docs, they are not installed here (*)
c6a99a5... Revert "Remove nonexistent qtwebengine-3rdparty.qdoc from %
5fc629e... Revert "Initial import for F25"
6aa8f11... Merge branch 'master' into f25
(*) This commit already existed in another branch; no separate mail sent
7 years, 11 months
