[openshot] New upstream release
by Leigh Scott
commit 40528ac82d8c7012b79fdf97e4c3f39cff95a009
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 2 11:43:53 2022 +0000
New upstream release
.gitignore | 1 +
openshot.spec | 46 +-
py310_fix.patch | 1968 -------------------------------------------------------
sources | 2 +-
4 files changed, 16 insertions(+), 2001 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4af0481..405f72a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ openshot-1.4.3.tar.gz
/openshot-qt-2.6.0.tar.gz
/openshot-qt-2.6.1.tar.gz
/openshot-b72327d1163f12362ff5d2a38751d3e2c61f7ba6.tar.gz
+/openshot-qt-3.0.0.tar.gz
diff --git a/openshot.spec b/openshot.spec
index cdab9a3..474fc48 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -1,13 +1,13 @@
-%global commit b72327d1163f12362ff5d2a38751d3e2c61f7ba6
-%global date 20211104
-%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
+#global commit b72327d1163f12362ff5d2a38751d3e2c61f7ba6
+#global date 20211104
+#global shortcommit0 %%(c=%{commit}; echo ${c:0:7})
# Redirect find_lang to our patched version
%global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot}
Name: openshot
-Version: 2.6.2
-Release: 0.4%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Version: 3.0.0
+Release: 1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -15,8 +15,8 @@ License: GPLv3+
URL: http://www.openshot.org
%global distname %{name}-qt
-#Source0: https://github.com/OpenShot/%{distname}/archive/v%{version}/%{distname}-%...
-Source0: https://github.com/OpenShot/%{distname}/archive/%{commit}/%{name}-%{commi...
+Source0: https://github.com/OpenShot/%{distname}/archive/v%{version}/%{distname}-%...
+#Source0: https://github.com/OpenShot/%%{distname}/archive/%%{commit}/%%{name}-%%{c...
# QT translation files are installed to a non-standard location
Source100: openshot-find-lang.sh
@@ -24,9 +24,6 @@ Source100: openshot-find-lang.sh
# Add openshot-owner@rpmfusion to appdata as update_contact
Patch1: openshot-rpmfusion-contact.patch
-# https://github.com/OpenShot/openshot-qt/pull/4527
-Patch2: py310_fix.patch
-
BuildArch: noarch
# libopenshot is unavailable on ppc64le, see rfbz #5528
ExcludeArch: ppc64le
@@ -37,8 +34,8 @@ BuildRequires: libappstream-glib
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-qt5-devel
BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: libopenshot >= 0.2.7
-BuildRequires: libopenshot-audio >= 0.1.9
+BuildRequires: libopenshot >= 0.3.0
+BuildRequires: libopenshot-audio >= 0.3.0
BuildRequires: desktop-file-utils
Requires: python%{python3_pkgversion}-httplib2
@@ -48,11 +45,7 @@ Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-setuptools
Requires: python%{python3_pkgversion}-zmq
Requires: python%{python3_pkgversion}-libopenshot >= 0.2.7
-%if 0%{?fedora} && 0%{?fedora} > 35
-Requires: compat-ffmpeg4
-%else
Requires: ffmpeg-libs >= 3.4.7
-%endif
%if 0%{?fedora}
Recommends: openshot-lang
@@ -60,6 +53,7 @@ Recommends: font(bitstreamverasans)
Recommends: blender >= 2.80
Recommends: python%{python3_pkgversion}-defusedxml
Recommends: python%{python3_pkgversion}-distro
+Recommends: python%{python3_pkgversion}-sentry-sdk
%else
Requires: openshot-lang
%endif
@@ -92,7 +86,7 @@ Requires: %{name} = %{version}-%{release}
%prep
-%autosetup -p1 -n %{distname}-%{commit}
+%autosetup -p1 -n %{distname}-%{version}
%build
@@ -132,21 +126,6 @@ rmdir -p --ignore-fail-on-non-empty %{buildroot}%{_prefix}/lib/mime/packages
%find_lang OpenShot --with-qt
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
-
-
%files
%license COPYING
%doc AUTHORS README.md
@@ -167,6 +146,9 @@ fi
%changelog
+* Fri Dec 02 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3.0.0-1
+- New upstream release
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.6.2-0.4.20211104gitb72327d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 406417c..cc97df1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openshot-b72327d1163f12362ff5d2a38751d3e2c61f7ba6.tar.gz) = f8b8e9288e4368ea6097bdce339c2d488b4dc59c6aa4accf693485153da22a44980c5b48bfc1c3dc0e838b66c08c5cb49e41207d66da7635e0d0a7dab0798aae
+SHA512 (openshot-qt-3.0.0.tar.gz) = c44c4ad25d321ea26e6fbafd8df0fca7dd2d7fc0827de208f60ebe98b0615e0f3d594660e6b482ebab25216cc26c9ece5b92bb6f26ab60d2e731d2194cc3e774
1 year, 4 months
[libopenshot] fix
by Leigh Scott
commit 42adbe9aa22dc6bd601fea7216c09208b5f6e10c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 2 11:04:01 2022 +0000
fix
libopenshot.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index 2141433..16c2800 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -25,6 +25,7 @@ BuildRequires: opencv-devel
BuildRequires: protobuf-devel
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtmultimedia-devel
+BuildRequires: qt5-qtsvg-devel
BuildRequires: unittest-cpp-devel
BuildRequires: cppzmq-devel
BuildRequires: zeromq-devel
1 year, 4 months
[libopenshot] New upstream release
by Leigh Scott
commit 8802c4d61b64880e84de94c8864c94d5247f1c3d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 2 10:55:50 2022 +0000
New upstream release
.gitignore | 1 +
libopenshot.spec | 40 ++++++++++++----------------------------
sources | 2 +-
3 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a1b6f5d..07e0532 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ libopenshot-0.0.6.tar.gz
/libopenshot-0.2.5.tar.gz
/libopenshot-0.2.6.tar.gz
/libopenshot-0.2.7.tar.gz
+/libopenshot-0.3.0.tar.gz
diff --git a/libopenshot.spec b/libopenshot.spec
index fed60a4..2141433 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -4,11 +4,11 @@
%define _lto_cflags %{nil}
Name: libopenshot
-Version: 0.2.7
-Release: 8%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: Library for creating and editing videos
-License: LGPLv3+
+License: LGPLv3+ and BSD and MIT and CC0 and CC-BY
URL: http://www.openshot.org/
Source0: %{github_url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -16,19 +16,11 @@ Source0: %{github_url}/archive/v%{version}/%{name}-%{version}.tar.gz
ExcludeArch: ppc64le
BuildRequires: gcc-c++
-%{?el7:BuildRequires: epel-rpm-macros}
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires: cmake3
-%else
BuildRequires: cmake
-%endif
BuildRequires: alsa-lib-devel
+BuildRequires: babl-devel
BuildRequires: ImageMagick-c++-devel
-%if 0%{?fedora} && 0%{?fedora} > 35
-BuildRequires: compat-ffmpeg4-devel
-%else
BuildRequires: ffmpeg-devel
-%endif
BuildRequires: opencv-devel
BuildRequires: protobuf-devel
BuildRequires: qt5-qttools-devel
@@ -39,8 +31,6 @@ BuildRequires: zeromq-devel
BuildRequires: jsoncpp-devel
BuildRequires: libopenshot-audio-devel
-# EL7 has other packages providing libzmq.so.5
-%{?el7:Requires: zeromq%{?isa} >= 0:4.1.4}
%description
OpenShot Library (libopenshot) is an open-source project
@@ -86,32 +76,23 @@ applications that use %{name}.
%autosetup -p1
%build
-%if 0%{?fedora} && 0%{?fedora} > 35
-export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-%endif
-%cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release
-%cmake3_build
+%cmake -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release
+%cmake_build
%check
-%cmake3_build --target test || :
+%cmake_build --target test || :
%install
-%cmake3_install
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
- %ldconfig_scriptlets
-%endif
+%cmake_install
%files
%doc AUTHORS README.md
-%license COPYING
+%license LICENSES/*
%{_libdir}/%{name}.so.*
-%{_libdir}/%{name}_protobuf.so.*
%files devel
%{_includedir}/%{name}/
%{_libdir}/%{name}.so
-%{_libdir}/%{name}_protobuf.so
%files -n python%{python3_pkgversion}-libopenshot
%{python3_sitearch}/*
@@ -120,6 +101,9 @@ export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
%{ruby_vendorarchdir}/*
%changelog
+* Fri Dec 02 2022 Leigh Scott <leigh123linux(a)gmail.com> - 0.3.0-1
+- New upstream release
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.2.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 6376636..01b19a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libopenshot-0.2.7.tar.gz) = 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
+SHA512 (libopenshot-0.3.0.tar.gz) = 5c72db9c39d2afaecb1c4ebf3192cd8795d4683f2b1210029b99657baf853515b92f392c25b65ea652a71d204a1b172123d264c95f1c3676a612e21f9ca38d2e
1 year, 4 months
[libopenshot-audio] New upstream release
by Leigh Scott
commit b74c6d188df8150e3e2db0b6ee820b481c683ae7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 2 09:17:12 2022 +0000
New upstream release
.gitignore | 1 +
libopenshot-audio.spec | 20 ++++++++------------
sources | 2 +-
3 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8e5ebb..a46cb36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ libopenshot-audio-0.0.6.tar.gz
/libopenshot-audio-0.2.0.tar.gz
/libopenshot-audio-0.2.1.tar.gz
/libopenshot-audio-0.2.2.tar.gz
+/libopenshot-audio-0.3.0.tar.gz
diff --git a/libopenshot-audio.spec b/libopenshot-audio.spec
index da0832d..fb54d78 100644
--- a/libopenshot-audio.spec
+++ b/libopenshot-audio.spec
@@ -1,6 +1,6 @@
Name: libopenshot-audio
-Version: 0.2.2
-Release: 3%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: Audio library used by OpenShot
License: GPLv3+
@@ -11,11 +11,7 @@ Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-
ExcludeArch: ppc64le
BuildRequires: gcc-c++
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires: cmake3
-%else
BuildRequires: cmake
-%endif
BuildRequires: alsa-lib-devel
BuildRequires: zlib-devel
@@ -39,16 +35,13 @@ developing applications that use %{name}.
%build
-%cmake3
-%cmake3_build
+%cmake
+%cmake_build
%install
-%cmake3_install
+%cmake_install
-%if 0%{?rhel} && 0%{?rhel} <= 7
- %ldconfig_scriptlets
-%endif
%files
%doc AUTHORS COPYING README.md
@@ -64,6 +57,9 @@ developing applications that use %{name}.
%changelog
+* Fri Dec 02 2022 Leigh Scott <leigh123linux(a)gmail.com> - 0.3.0-1
+- New upstream release
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 73b0961..bb22946 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libopenshot-audio-0.2.2.tar.gz) = 9960c6225dd9b843d18134e851761bf12861220a2c63970055bc73d554725e56abd6d35339f7490b672faaf0699f58e3701ff8a966ab07af3264325a9d0dc472
+SHA512 (libopenshot-audio-0.3.0.tar.gz) = 75f4f4170f8e4f442a31834e65b9ab56bfb2e034d81e0015add5d79c9ccaa3dd2806ae78b1ca97fab20eefa4c37990609755d0c07c306ca19f9cdca3884f0163
1 year, 4 months