[kffmpegthumbnailer] Switch to maintained source
commit 89bb9c9eb79d1e582407c202b56142f6ebdea749
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Sep 3 21:47:10 2020 +0100
Switch to maintained source
.gitignore | 1 +
kffmpegthumbnailer-c++11.patch | 11 -----------
kffmpegthumbnailer.spec | 38 ++++++++++++++++++++++----------------
sources | 2 +-
4 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 403b870..4c5c767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
kffmpegthumbnailer-1.1.0.tar.gz
+/ffmpegthumbnailer-2.2.2.tar.gz
diff --git a/kffmpegthumbnailer.spec b/kffmpegthumbnailer.spec
index 7be9985..42ae973 100644
--- a/kffmpegthumbnailer.spec
+++ b/kffmpegthumbnailer.spec
@@ -1,15 +1,18 @@
+%undefine __cmake_in_source_build
+%global ff_version 2.2.2
+
Name: kffmpegthumbnailer
Version: 1.1.0
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: A video thumbnailer for kde based on ffmpegthumbnailer
Group: Applications/Multimedia
License: GPLv2+
-URL: http://code.google.com/p/ffmpegthumbnailer/
-Source0: http://ffmpegthumbnailer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: kffmpegthumbnailer-c++11.patch
+URL: https://github.com/dirkvdb/ffmpegthumbnailer
+Source0: %{url}/archive/%{ff_version}/ffmpegthumbnailer-%{ff_version}.tar.gz
-BuildRequires: ffmpegthumbnailer-devel kdelibs-devel
+BuildRequires: ffmpegthumbnailer-devel
+BuildRequires: kdelibs-devel
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -20,30 +23,33 @@ The thumbnailer uses ffmpeg to decode frames from the video files.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1 -n ffmpegthumbnailer-%{ff_version}
chmod -x INSTALL
%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+cd %{name}
+%{cmake_kde4} \
+ -Wno-dev \
+ -B %{_vpath_builddir} \
+ -S .
+%cmake_build
%install
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+cd %{name}
+%cmake_install
%files
-%doc README Changelog
-%license COPYRIGHT
+%doc kffmpegthumbnailer/README kffmpegthumbnailer/Changelog
+%license kffmpegthumbnailer/COPYRIGHT
%{_kde4_datadir}/kde4/services/kffmpegthumbnailer.desktop
%{_kde4_libdir}/kde4/kffmpegthumbnailer.so
%changelog
+* Thu Sep 03 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.1.0-19
+- Switch to maintained source
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.1.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index e3f334e..2b00b70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa897450ee691b6d225d8f79a6cfd409 kffmpegthumbnailer-1.1.0.tar.gz
+SHA512 (ffmpegthumbnailer-2.2.2.tar.gz) =
f18f7293074a818e7937f62eb9616fb1e2a7c3451147581894676e64f8dc4edb4de046e2e86f23cec0a5b938c5b2181a91331e9a1dec0851c3f36b08886e617e