December 2016 - rpmfusion-commits

[flowblade/f23: 2/2] Merge branch 'master' into f23

by Martin Gansser

commit 33d2650cca47fe1e478b1fb65dc128d9fa4908b4 Merge: b5ec3c8 7ded90a Author: Martin Gansser <mgansser(a)alice.de> Date: Fri Dec 16 09:37:04 2016 +0100 Merge branch 'master' into f23 flowblade.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---

7 years, 4 months

1
0
0 / 0

[flowblade/f23] (2 commits) ...Merge branch 'master' into f23

by Martin Gansser

Summary of changes: 7ded90a... Readd ffmpeg Add Requires mlt-freeworld in a if clause (*) 33d2650... Merge branch 'master' into f23 (*) This commit already existed in another branch; no separate mail sent

7 years, 4 months

1
0
0 / 0

[flowblade/f24: 2/2] Merge branch 'master' into f24

by Martin Gansser

commit 54abf7974220ffd4207180f31d3c4e7b4d1e2cfe Merge: ab45e33 7ded90a Author: Martin Gansser <mgansser(a)alice.de> Date: Fri Dec 16 09:36:38 2016 +0100 Merge branch 'master' into f24 flowblade.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---

7 years, 4 months

1
0
0 / 0

[flowblade/f24] (2 commits) ...Merge branch 'master' into f24

by Martin Gansser

Summary of changes: 7ded90a... Readd ffmpeg Add Requires mlt-freeworld in a if clause (*) 54abf79... Merge branch 'master' into f24 (*) This commit already existed in another branch; no separate mail sent

7 years, 4 months

1
0
0 / 0

[flowblade/f25] Readd ffmpeg Add Requires mlt-freeworld in a if clause

by Martin Gansser

Summary of changes: 7ded90a... Readd ffmpeg Add Requires mlt-freeworld in a if clause (*) (*) This commit already existed in another branch; no separate mail sent

7 years, 4 months

1
0
0 / 0

[flowblade] Readd ffmpeg Add Requires mlt-freeworld in a if clause

by Martin Gansser

commit 7ded90a8c2a5ac684dd33c5325e34d3f33798140 Author: Martin Gansser <mgansser(a)alice.de> Date: Fri Dec 16 09:35:13 2016 +0100 Readd ffmpeg Add Requires mlt-freeworld in a if clause flowblade.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- diff --git a/flowblade.spec b/flowblade.spec index 1f606fb..042dbef 100644 --- a/flowblade.spec +++ b/flowblade.spec @@ -4,7 +4,7 @@ Name: flowblade Version: 1.10.0 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} License: GPLv3 Summary: Multitrack non-linear video editor for Linux Url: https://github.com/jliljebl/flowblade @@ -14,6 +14,7 @@ Patch0: flowblade-001_sys_path.patch BuildRequires: desktop-file-utils BuildRequires: python2-devel BuildRequires: python2-setuptools +Requires: ffmpeg Requires: mlt-python Requires: mlt-freeworld Requires: frei0r-plugins >= 1.4 @@ -31,6 +32,9 @@ Requires: python2-pillow Requires: numpy Requires: python-pillow %endif +%if 0%{?fedora} >= 25 +Requires: mlt-freeworld +%endif BuildArch: noarch @@ -108,6 +112,10 @@ fi %{python2_sitelib}/flowblade* %changelog +* Fri Dec 16 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.10.0-2.git25c07ce +- Readd ffmpeg +- Add Requires mlt-freeworld in a if clause + * 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

7 years, 4 months

1
0
0 / 0

[flowblade/f23: 2/2] Merge branch 'master' into f23

by Martin Gansser

commit b5ec3c8f1388e793b29fbf72b5583287fa9a4d27 Merge: 16ab266 afa0538 Author: Martin Gansser <mgansser(a)alice.de> Date: Thu Dec 15 21:46:30 2016 +0100 Merge branch 'master' into f23 .gitignore | 1 + flowblade.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) ---

7 years, 4 months

1
0
0 / 0

[flowblade/f23] (2 commits) ...Merge branch 'master' into f23

by Martin Gansser

Summary of changes: afa0538... Update to 1.10.0-1.git25c07ce (*) b5ec3c8... Merge branch 'master' into f23 (*) This commit already existed in another branch; no separate mail sent

7 years, 4 months

1
0
0 / 0

[flowblade/f24: 2/2] Merge branch 'master' into f24

by Martin Gansser

commit ab45e33d9104accb0a6cafaaddcfdd02f4460b60 Merge: 9114c9d afa0538 Author: Martin Gansser <mgansser(a)alice.de> Date: Thu Dec 15 21:46:05 2016 +0100 Merge branch 'master' into f24 .gitignore | 1 + flowblade.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) ---

7 years, 4 months

1
0
0 / 0

[flowblade/f24] (2 commits) ...Merge branch 'master' into f24

by Martin Gansser

Summary of changes: afa0538... Update to 1.10.0-1.git25c07ce (*) ab45e33... Merge branch 'master' into f24 (*) This commit already existed in another branch; no separate mail sent

7 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits December 2016