commit 9b8566f3d25c680b2e1764967176d5b6893ecafe
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 29 11:53:28 2024 +0100
Fix desktop file (rfbz#7068)
.gitignore | 2 ++
avidemux.spec | 16 +++++++++++-----
sources | 4 ++--
3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a5b7a1..8654223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ avidemux_2.6.10.tar.gz
/avidemux_2.8.1.tar.gz
/avidemux-601e92dabd4c1d2dcde639557d12cc1043e96669.tar.gz
/avidemux_i18n-1ac2cab673c89e18c3819cca3f8749da85550d6c.tar.gz
+/avidemux-506a9ee43ad15b452d5f232a151a795cc8503918.tar.gz
+/avidemux_i18n-b91c7f7c26577e5be005b094604f813058c31682.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index 5ffc9b3..5b00e3d 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,9 +1,9 @@
-%global commit 601e92dabd4c1d2dcde639557d12cc1043e96669
-%global commitdate 20240430
+%global commit 506a9ee43ad15b452d5f232a151a795cc8503918
+%global commitdate 20240928
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit0 1ac2cab673c89e18c3819cca3f8749da85550d6c
-%global commitdate0 20240316
+%global commit0 b91c7f7c26577e5be005b094604f813058c31682
+%global commitdate0 20240815
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
@@ -16,7 +16,7 @@
Name: avidemux
Version: 2.8.2
-Release: 2%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
+Release: 3%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -141,6 +141,8 @@ rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
avidemux_plugins/ADM_videoFilters6/ass/ADM_libass \
avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2
+sed -i -e 's@avidemux3_qt5@avidemux3_qt6@g'
avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop
+
%build
export LDFLAGS="%{optflags} -lc -Wl,--as-needed"
@@ -297,6 +299,10 @@ appstream-util validate-relax --nonet \
%changelog
+* Sun Sep 29 2024 Leigh Scott <leigh123linux(a)gmail.com> -
2.8.2-3^git20240928.506a9ee
+- Fix desktop file (rfbz#7068)
+- Update git snapshot
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
2.8.2-2^git20240430.601e92d
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index c699641..444e915 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (avidemux-601e92dabd4c1d2dcde639557d12cc1043e96669.tar.gz) =
e4e0b6ab040e5c618f0447308b963823045ee2f679c87f7494769f101749fc82367e99dd833594818fa02e1261adaf8ae28dbc8777b17071bf26a68693288347
-SHA512 (avidemux_i18n-1ac2cab673c89e18c3819cca3f8749da85550d6c.tar.gz) =
b7880234294baa771b637bb46bfc2886f2fad21042b34d1d618802ee93b5ca645291258bc8d0c50a9b7c56c4e5d3b8ce1bb13d68509dda16db9e124b7204511a
+SHA512 (avidemux-506a9ee43ad15b452d5f232a151a795cc8503918.tar.gz) =
7d9a8b3e0b44022662c462937a3001e3be3089d17a9078447560366dfa038bd088d1e4a0b5ad4879008a7bff1f6cabdd36d5ba5a68bd464d165225d0d9d06de5
+SHA512 (avidemux_i18n-b91c7f7c26577e5be005b094604f813058c31682.tar.gz) =
e24bd99913a480be155fc551d07d97baf9edef2b44336ecfc20bd01f8d33e908d947e3c5a16cfa11de96a2d4daf4db00222789c8bca212b168bd58b341f13a59