commit 665578ca6a1c7db5767100245b4d879d78cff834 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Aug 26 19:49:19 2021 +0100 New upstream release .gitignore | 1 + gcc10_fix.patch | 51 --------------------------------------------------- libopenshot.spec | 28 +++++++++++++++++----------- sources | 2 +- test_fix.patch | 45 --------------------------------------------- 5 files changed, 19 insertions(+), 108 deletions(-) --- diff --git a/.gitignore b/.gitignore index e6489e8..fa31da1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libopenshot-0.0.6.tar.gz /libopenshot-c685571.tar.gz /libopenshot-0.2.4.tar.gz /libopenshot-0.2.5.tar.gz +/libopenshot-0.2.6.tar.gz diff --git a/libopenshot.spec b/libopenshot.spec index ecc9757..5a40155 100644 --- a/libopenshot.spec +++ b/libopenshot.spec @@ -4,24 +4,27 @@ %define _lto_cflags %{nil} Name: libopenshot -Version: 0.2.5 -Release: 10%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: Library for creating and editing videos License: LGPLv3+ URL: http://www.openshot.org/ Source0: %{github_url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: %{github_url}/commit/13290364e7bea54164ab83d973951f2898ad9e23.patch#/gcc10_fix.patch -Patch1: %{github_url}/commit/f71051e8f1add0b893ffaa9a799625017978e7f8.patch#/test_fix.patch # libopenshot is completely broken on ppc64le, see rfbz #5528 ExcludeArch: ppc64le BuildRequires: gcc-c++ %{?el7:BuildRequires: epel-rpm-macros} +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: cmake3 +%else +BuildRequires: cmake +%endif BuildRequires: ImageMagick-c++-devel BuildRequires: ffmpeg-devel +BuildRequires: protobuf-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtmultimedia-devel BuildRequires: unittest-cpp-devel @@ -77,16 +80,14 @@ applications that use %{name}. %autosetup -p1 %build - -#export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}" %cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release . -%cmake_build +%cmake3_build %check -%cmake_build --target os_test || : +%cmake3_build --target test || : %install -%cmake_install +%cmake3_install %if 0%{?rhel} && 0%{?rhel} <= 7 %ldconfig_scriptlets @@ -95,11 +96,13 @@ applications that use %{name}. %files %doc AUTHORS README.md %license COPYING -%{_libdir}/*.so.* +%{_libdir}/%{name}.so.* +%{_libdir}/%{name}_protobuf.so.* %files devel %{_includedir}/%{name}/ -%{_libdir}/*.so +%{_libdir}/%{name}.so +%{_libdir}/%{name}_protobuf.so %files -n python%{python3_pkgversion}-libopenshot %{python3_sitearch}/* @@ -108,6 +111,9 @@ applications that use %{name}. %{ruby_vendorarchdir}/* %changelog +* Thu Aug 26 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 0.2.6-1 +- New upstream release + * Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.2.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 2dad97d..225f4c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libopenshot-0.2.5.tar.gz) = b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7 +SHA512 (libopenshot-0.2.6.tar.gz) = 13706733280e8c70638a02ad220e6a84f3d26a5a35f5f8f1b820408236aeda8bd8683e19a85a0d466007a1d711ca31bb436f8d4ca4fb6ffbfe169b2976dea525