[kffmpegthumbnailer] Fix build on F23

Sérgio M. Basto sergiomb at rpmfusion.org
Wed Aug 3 06:05:43 CEST 2016


commit e1f45da8daa8a8b89e66d74798f6146c5605acf6
Author: Sérgio M. Basto <sergio at serjux.com>
Date:   Wed Aug 3 05:02:54 2016 +0100

    Fix build on F23
    
    - Add license tag
    - Spec quick clean up

 kffmpegthumbnailer-c++11.patch | 11 +++++++++++
 kffmpegthumbnailer.spec        | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/kffmpegthumbnailer-c++11.patch b/kffmpegthumbnailer-c++11.patch
new file mode 100644
index 0000000..88f2e82
--- /dev/null
+++ b/kffmpegthumbnailer-c++11.patch
@@ -0,0 +1,11 @@
+Add -std=c++11 like in ffmpegthumbnailer-2.1.1/CMakeLists.txt line 31
+--- kffmpegthumbnailer/CMakeLists.txt.orig	2016-08-03 04:54:49.283498739 +0100
++++ kffmpegthumbnailer/CMakeLists.txt	2016-08-03 04:56:11.369554153 +0100
+@@ -29,6 +29,7 @@ pkg_check_modules(FFMPEG_THUMBNAILER lib
+ include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ${AVUTIL_INCLUDES} ${AVFORMAT_INCLUDES} ${AVCODEC_INCLUDES} ${SWSCALE_INCLUDES} ${FFMPEG_THUMBNAILER_INCLUDES})
+ 
+ set(kffmpegthumbnailer_SRCS kffmpegthumbnailer.cpp)
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ string(REGEX REPLACE "-fno-exceptions " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+ kde4_add_plugin(kffmpegthumbnailer ${kffmpegthumbnailer_SRCS})
diff --git a/kffmpegthumbnailer.spec b/kffmpegthumbnailer.spec
index 4286ce4..b11c81c 100644
--- a/kffmpegthumbnailer.spec
+++ b/kffmpegthumbnailer.spec
@@ -1,15 +1,15 @@
 Name:           kffmpegthumbnailer
 Version:        1.1.0
-Release:        9%{?dist}
+Release:        10%{?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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         kffmpegthumbnailer-c++11.patch
 
-BuildRequires:  ffmpegthumbnailer-devel, kdelibs-devel
+BuildRequires:  ffmpegthumbnailer-devel kdelibs-devel
 
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -21,6 +21,7 @@ The thumbnailer uses ffmpeg to decode frames from the video files.
 
 %prep
 %setup -q
+%patch0 -p1
 chmod -x INSTALL
 
 %build
@@ -33,21 +34,21 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
-%doc COPYRIGHT README Changelog
+%doc README Changelog
+%license COPYRIGHT
 %{_kde4_datadir}/kde4/services/kffmpegthumbnailer.desktop
 %{_kde4_libdir}/kde4/kffmpegthumbnailer.so
 
 %changelog
+* Wed Aug 03 2016 Sérgio Basto <sergio at serjux.com> - 1.1.0-10
+- Fix build on F23
+- Add license tag
+- Spec quick clean up
+
 * Tue Aug 02 2016 Leigh Scott <leigh123linux at googlemail.com> - 1.1.0-9
 - remove requires kdebase-workspace (rfbz 3719)
 


More information about the rpmfusion-commits mailing list