[openshot/el7] Change python3 BuildRequires/Requires for pkgversion macro for el7.
by Richard Shaw
commit b2d1626e070421baa6aea5f5dfd87683006b5400
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Nov 22 06:57:37 2017 -0600
Change python3 BuildRequires/Requires for pkgversion macro for el7.
openshot.spec | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/openshot.spec b/openshot.spec
index 1f5ab44..cb3816b 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -17,20 +17,20 @@ Source100: openshot-find-lang.sh
BuildArch: noarch
-BuildRequires: python3-devel
-BuildRequires: python3-qt5-devel
-BuildRequires: python3-setuptools
+BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python%{python3_pkgversion}-qt5-devel
+BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: libopenshot >= 0.1.8
BuildRequires: libopenshot-audio
BuildRequires: desktop-file-utils
# To fix icon
BuildRequires: ImageMagick
-Requires: python3-qt5
-Requires: python3-qt5-webkit
-Requires: python3-httplib2
-Requires: python3-libopenshot >= 0.1.8
-Requires: python3-zmq
+Requires: python%{python3_pkgversion}-qt5
+Requires: python%{python3_pkgversion}-qt5-webkit
+Requires: python%{python3_pkgversion}-httplib2
+Requires: python%{python3_pkgversion}-libopenshot >= 0.1.8
+Requires: python%{python3_pkgversion}-zmq
Requires: ffmpeg-libs
%if 0%{?fedora}
7 years
[openshot/el7] Change Recommends to Requires for el7.
by Richard Shaw
commit 9bc17ad6fd28fd28895d8c888e0045d79697edf5
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Nov 22 06:40:05 2017 -0600
Change Recommends to Requires for el7.
openshot.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/openshot.spec b/openshot.spec
index a5d2db4..1f5ab44 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -33,8 +33,12 @@ Requires: python3-libopenshot >= 0.1.8
Requires: python3-zmq
Requires: ffmpeg-libs
+%if 0%{?fedora}
Recommends: openshot-lang
Recommends: font(bitstreamverasans)
+%else
+Requires: openshot-lang
+%endif
%description
7 years
[openshot/el7: 24/24] Merge branch 'master' into el7
by Richard Shaw
commit cb3156d75122e1487f11f199bc7dfa425a9957b5
Merge: 0a80a36 298d28e
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Nov 22 06:32:12 2017 -0600
Merge branch 'master' into el7
.gitignore | 8 ++
openshot-1.4.0-doc-install.diff | 44 -------
openshot-1.4.0-use_mlt-melt.diff | 24 ----
openshot-find-lang.sh | 253 ++++++++++++++++++++++++++++++++++++++
openshot.png | Bin 3997 -> 0 bytes
openshot.spec | 256 +++++++++++++++++++++------------------
sources | 2 +-
7 files changed, 401 insertions(+), 186 deletions(-)
---
7 years
[openshot/el7] (24 commits) ...Merge branch 'master' into el7
by Richard Shaw
Summary of changes:
54ddf9b... Update to latest upstream release. (*)
e0eb8e7... Update to latest upstream release. (*)
51dd564... Update to require python3-libopenshot. (*)
8c0c2d2... Add python3-qt5-webkit to package requires. (*)
b8dce73... upload sources and add python3-qt5-webkit to package requir (*)
5a84e1a... Rebuilt for ffmpeg-3.1.1 (*)
9442c10... Install locale files. (*)
620dda5... Update to latest upstream release. (*)
fb7c32d... Reset release and update changelog date. (*)
42d7f37... All translation files now included in openshot-lang, fixes (*)
b87b5ce... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
bfadac1... Update openshot to 2.2.0 (*)
dc25f7e... Update to latest upstream release. (*)
c8d9aef... Update to 2.3.1 (*)
0d40f66... Rebuild for ffmpeg update (*)
17e03e3... Update to latest upstream release. (*)
fcd720b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
83097a0... Update to 2.3.4 (*)
0d5f882... Update to 2.4.0 (*)
467b764... bump required libopenshot verson (*)
af6c5b3... Also requires libopenshot >= 0.1.8 (*)
a516e64... Add recommends for Vera Sans font, fixes RFBZ#5677. (*)
298d28e... Bump release. (*)
cb3156d... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
7 years
[libopenshot/el7: 2/2] Adjust python for el7
by Leigh Scott
commit 34310dc2875d614f3606b3acb82b884fe8083eac
Merge: 9b36625 e3efea9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Nov 22 00:56:28 2017 +0000
Adjust python for el7
libopenshot.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
7 years
[libopenshot] Adjust python for el7
by Leigh Scott
commit e3efea93fecaf3b7e83801bfb17f4bfeab8f2a5e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Nov 22 00:55:58 2017 +0000
Adjust python for el7
libopenshot.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index 4c842be..ff2ec46 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,6 +1,6 @@
Name: libopenshot
Version: 0.1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library for creating and editing videos
License: LGPLv3+
@@ -8,7 +8,7 @@ URL: http://www.openshot.org/
Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version...
BuildRequires: cmake swig
-BuildRequires: python3-devel
+BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: ImageMagick-c++-devel
BuildRequires: ffmpeg-devel
BuildRequires: libopenshot-audio-devel >= 0.1.4
@@ -34,14 +34,14 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
-%package -n python3-%{name}
+%package -n python%{python3_pkgversion}-%{name}
Summary: Python bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Group: Development/Libraries
Obsoletes: python-%{name} < 0.1.1-2
Provides: python-%{name}
-%description -n python3-%{name}
+%description -n python%{python3_pkgversion}-%{name}
The python-%{name} package contains python bindings for
applications that use %{name}.
@@ -74,11 +74,14 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed -Wno-error"
%{_includedir}/%{name}/
%{_libdir}/*.so
-%files -n python3-libopenshot
+%files -n python%{python3_pkgversion}-libopenshot
%{python3_sitearch}/*
%changelog
+* Wed Nov 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.8-3
+- Adjust python for el7
+
* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.8-2
- Rebuild for ffmpeg update
7 years
[libopenshot/el7: 24/24] Sync with master
by Richard Shaw
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.
7 years
[libopenshot/el7] (24 commits) ...Sync with master
by Richard Shaw
Summary of changes:
dab2eb3... Initial import (BZ#3290). (*)
1c2e3c0... * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0 (*)
3752f9e... * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0 (*)
faa436e... Rebuilt for FFmpeg 2.4.3 (*)
1bcfe06... * Mon May 18 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - (*)
8c5e079... * Wed Jun 24 2015 Sérgio Basto <sergio(a)serjux.com> - 0.0.4 (*)
9522430... * Mon Nov 16 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.0 (*)
9ed83eb... Update to latest upstream release. (*)
01af7d2... Merge branch 'master' of ssh://pkgs.kwizart.net/free/rpms/l (*)
1d1e207... Update to latest upstream release. (*)
12ecc8b... Rename python-libopenshot to python3-libopenshot. (*)
20bbc73... Update source file (*)
20d02d3... Rebuilt for ffmpeg-3.1.1 (*)
e42df8f... Update to latest upstream release. (*)
d435708... Update to latest upstream release. (*)
2a2f7fa... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
dcf6d12... Update to 0.1.4 (*)
19d049f... Rebuild for ffmpeg update (*)
46699c3... Update to latest upstream release. (*)
1a3e78b... Rebuilt for ImageMagick (*)
8f577e9... Update libopenshot to 0.1.7 Fix compilation with GCC 7 by a (*)
9c0dc5a... Update libopenshot to 0.1.8 (*)
6950fed... Rebuild for ffmpeg update (*)
9b36625... Sync with master
(*) This commit already existed in another branch; no separate mail sent
7 years
[libopenshot-audio/el7: 16/16] Fix conflicts with master.
by Richard Shaw
commit 076144c07e5c4d752f780ccad177e6d5ec104e2c
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Nov 21 07:09:07 2017 -0600
Fix conflicts with master.
sources | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/sources b/sources
index 83dcff4..198f8ce 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1bb08aef04135d1cc3a842de23b7c519 libopenshot-audio-0.0.3.tar.gz
-=======
09cc90dbdc97450b9023ff4a56aa2279 libopenshot-audio-0.1.4.tar.gz
->>>>>>> master
7 years