1:20 p.m.
commit 9568a3aa714a99c088e861ed12ce20825f12e423
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jul 14 14:18:52 2022 +0100
Update to 0.7.4
.gitignore | 3 +--
autoupdate.patch | 58 ----------------------------------------
deprecated_QString_sprintf.patch | 11 --------
dvbcut.spec | 54 ++++++++++++-------------------------
ffmpeg35_buildfix.patch | 12 ---------
sources | 2 +-
6 files changed, 19 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96608ff..8f58001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-dvbcut-svn179.tar.bz2
-/dvbcut-0.7.3.tar.gz
+/dvbcut-*.tar.gz
diff --git a/dvbcut.spec b/dvbcut.spec
index 6d24fc9..9680f1f 100644
--- a/dvbcut.spec
+++ b/dvbcut.spec
@@ -1,8 +1,8 @@
%define svnrev 179
Name: dvbcut
-Version: 0.7.3
-Release: 2%{?dist}
+Version: 0.7.4
+Release: 1%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
@@ -12,18 +12,15 @@ URL: https://github.com/bernhardu/dvbcut-deb
# use sh dvbcut-snapshot.sh to create the archive
Source0:
https://github.com/bernhardu/dvbcut-deb/archive/v%{version}/%{name}-%{ver...
# PATCH-FIX-OPENSUSE dvbcut-use_pkgconfig.patch aloisio(a)gmx.com -- use pkgconfig for
ffmpeg libraries
-Patch1: dvbcut-use_pkgconfig.patch
+Patch0: dvbcut-use_pkgconfig.patch
# PATCH-FIX-OPENSUSE dvbcut-appicon-patch aloisio(a)gmx.com -- install icon in the proper
path
-Patch3: dvbcut-appicon.patch
+Patch1: dvbcut-appicon.patch
# PATCH-FIX-OPENSUSE dvbcut-locale.patch aloisio(a)gmx.com -- also install .qm locale
files
-Patch4: dvbcut-locale.patch
-Patch5: deprecated_QString_sprintf.patch
-Patch6: autoupdate.patch
+Patch2: dvbcut-locale.patch
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: gcc-c++
-BuildRequires: libao-devel
BuildRequires: a52dec-devel
BuildRequires: hicolor-icon-theme
BuildRequires: qt5-linguist
@@ -34,15 +31,12 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(ao)
BuildRequires: libmad-devel
-%if 0%{?fedora} && 0%{?fedora} > 35
-BuildRequires: compat-ffmpeg4-devel
-%else
BuildRequires: ffmpeg-devel
-%endif
BuildRequires: desktop-file-utils
-Requires: hicolor-icon-theme
+
+Requires: hicolor-icon-theme
# mplayer not actually required, but much better with it.
-Requires: mplayer
+Recommends: mplayer
%description
@@ -60,9 +54,6 @@ dvbcut can use Mplayer if available.
%build
-%if 0%{?fedora} && 0%{?fedora} > 35
-export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-%endif
autoreconf -i
%configure
@@ -72,37 +63,26 @@ autoreconf -i
%install
%make_install
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-update-desktop-database &> /dev/null || :
-
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-update-desktop-database &> /dev/null || :
-
+desktop-file-install \
+ --delete-original \
+ --dir %{buildroot}/%{_datadir}/applications/ \
+ %{buildroot}/%{_datadir}/applications/*.desktop
%files
%doc ChangeLog CREDITS README README.icons
%license COPYING
%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
%{_datadir}/mime/packages/dvbcut.xml
%changelog
+* Thu Jul 14 2022 Leigh Scott <leigh123linux(a)gmail.com> - 0.7.4-1
+- Update to 0.7.4
+
* Sun Feb 27 2022 Sérgio Basto <sergio(a)serjux.com> - 0.7.3-2
- Switch to compat-ffmpeg4
diff --git a/sources b/sources
index 6a70af9..93c0dcd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dvbcut-0.7.3.tar.gz) =
9473bc4d8dcd16f44ed25e586aacff6467a7b0530c3613a6f856d21cb2767991187a405b63a0ac4f4a130eaf0e7cd4697b440a57f29142186ff08fe923cd4580
+SHA512 (dvbcut-0.7.4.tar.gz) =
f63fb697f672f85dff81789d80f82cb873ad1b3f2abd3377786e8790d94ed35d215c22b7da40c6f4d61b8c92f7cff0af3142e79ef43efd8efd37983a5ec3ff0d