commit 55c68abff4d4fbdeaa25ba2704ee68ce19408de7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 26 23:54:19 2021 +0100
New upstream release
.gitignore | 1 +
openshot-2.5.1-unity.patch | 71 ----------------------------------------------
openshot-find-lang.sh | 2 +-
openshot.spec | 18 ++++++------
sources | 3 +-
5 files changed, 12 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58b09d3..40123d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ openshot-1.4.3.tar.gz
/openshot-qt-5f08a30.tar.gz
/openshot-qt-2.5.0.tar.gz
/openshot-qt-2.5.1.tar.gz
+/openshot-qt-2.6.0.tar.gz
diff --git a/openshot-find-lang.sh b/openshot-find-lang.sh
index 8f74517..c0b005c 100755
--- a/openshot-find-lang.sh
+++ b/openshot-find-lang.sh
@@ -243,7 +243,7 @@ s:%lang(C) ::
find "$TOP_DIR" -type f -o -type l|sed '
s:'"$TOP_DIR"'::
-'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'\.\([a-zA-Z]\{2,3\}\([_@].*\)\?\)\.qm$\):%lang(\2)
\1:
+'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'\_\([a-zA-Z]\{2,3\}\([_@].*\)\?\)\.qm$\):%lang(\2)
\1:
'"$NO_ALL_NAME$QT"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.qm$\):%lang(\2)
\1\2\3:
'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2)
\1:
'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
diff --git a/openshot.spec b/openshot.spec
index c7e60b0..3eac12c 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -2,8 +2,8 @@
%global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot}
Name: openshot
-Version: 2.5.1
-Release: 8%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -18,9 +18,6 @@ Source100: openshot-find-lang.sh
# Add openshot-owner@rpmfusion to appdata as update_contact
Patch1: openshot-rpmfusion-contact.patch
-# Backported fix for crashes under Python 3.9, see
-#
https://github.com/OpenShot/openshot-qt/pull/3937/
-Patch2: openshot-2.5.1-unity.patch
BuildArch: noarch
# libopenshot is unavailable on ppc64le, see rfbz #5528
@@ -49,10 +46,10 @@ Requires: ffmpeg-libs >= 3.4.7
Recommends: openshot-lang
Recommends: font(bitstreamverasans)
Recommends: blender >= 2.80
-Recommends: python%{python3_pkgversion}-defusedxml
-Recommends: python%{python3_pkgversion}-distro
+Recommends: python%{python3_pkgversion}-defusedxml
+Recommends: python%{python3_pkgversion}-distro
%else
-Requires: openshot-lang
+Requires: openshot-lang
%endif
@@ -143,7 +140,7 @@ fi
%doc AUTHORS README.md
%{_bindir}/*
%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%{_metainfodir}/*.appdata.xml
@@ -158,6 +155,9 @@ fi
%changelog
+* Thu Aug 26 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.6.0-1
+- New upstream release
+
* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
2.5.1-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index bf3fe00..1fad90b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (openshot-qt-2.5.0.tar.gz) =
0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
-SHA512 (openshot-qt-2.5.1.tar.gz) =
8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
+SHA512 (openshot-qt-2.6.0.tar.gz) =
9e569f318672047e8251d00ce0bb80e4b295d5daba58c11a3e286b7daebf45b35a34d4ecc5a9d81891b0a68d75d813a78023ee984b8690a2d1217a8517239ee9