[packages/ffmpegthumbnailer] - updated to 2.1.1 release - added pc patch (fix libdir and Libs.private with stray -L)

[qboosh]

commit 0e801e1dcf505189df772289926fd1aee418e389
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 14 14:51:51 2016 +0200

    - updated to 2.1.1 release
    - added pc patch (fix libdir and Libs.private with stray -L)

 ffmpegthumbnailer-pc.patch | 21 +++++++++++++++++++++
 ffmpegthumbnailer.spec     | 29 ++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 11 deletions(-)
---
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index 93bc5ac..94a394b 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -1,15 +1,20 @@
-%define		snap	9503bb9b
+#
+# Conditional build:
+%bcond_without	static_libs	# static library
+#
 Summary:	Lightweight video thumbnailer
 Summary(pl.UTF-8):	Lekki program do wykonywania miniaturek dla filmów
 Name:		ffmpegthumbnailer
 Version:	2.1.1
-Release:	0.%{snap}.1
+Release:	1
 License:	GPL v2
 Group:		Applications/Graphics
-Source0:	%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5:	df7d3bc94a4cf37e1337eab246715e10
+#Source0Download: https://github.com/dirkvdb/ffmpegthumbnailer/releases
+Source0:	https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	753c8ba68f66ae085ef178d7c5966cae
+Patch0:		%{name}-pc.patch
 URL:		https://github.com/dirkvdb/ffmpegthumbnailer
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.8
 # libavcodec >= 52.26.0 libavformat libavutil libswscale
 BuildRequires:	ffmpeg-devel >= 0.6
 BuildRequires:	libjpeg-devel
@@ -18,7 +23,7 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 # dlopens libglib-2.0.so.0 libgobject-2.0.so.0 libgio-2.0.so.0
-Requires:	glib2
+Requires:	glib2 >= 2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,16 +65,16 @@ Statyczna biblioteka libffmpegthumbnailer.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir build
 cd build
-%{cmake} \
-	-DENABLE_TESTS=ON \
-	-DENABLE_STATIC=ON \
+%cmake .. \
 	-DENABLE_GIO=ON \
-	-DENABLE_THUMBNAILER=ON \
-	..
+	-DENABLE_TESTS=ON \
+	%{?with_static_libs:-DENABLE_STATIC=ON} \
+	-DENABLE_THUMBNAILER=ON
 
 %{__make}
 
@@ -101,6 +106,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libffmpegthumbnailer
 %{_pkgconfigdir}/libffmpegthumbnailer.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libffmpegthumbnailer.a
+%endif
diff --git a/ffmpegthumbnailer-pc.patch b/ffmpegthumbnailer-pc.patch
new file mode 100644
index 0000000..ee3af7c
--- /dev/null
+++ b/ffmpegthumbnailer-pc.patch
@@ -0,0 +1,21 @@
+--- ffmpegthumbnailer-2.1.1/libffmpegthumbnailer.pc.in.orig	2015-04-26 17:08:35.000000000 +0200
++++ ffmpegthumbnailer-2.1.1/libffmpegthumbnailer.pc.in	2016-05-14 14:42:05.413671933 +0200
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: libffmpegthumbnailer
+--- ffmpegthumbnailer-2.1.1/CMakeLists.txt.orig	2016-02-20 18:36:22.000000000 +0100
++++ ffmpegthumbnailer-2.1.1/CMakeLists.txt	2016-05-14 14:43:05.740336067 +0200
+@@ -104,7 +104,7 @@
+ LIST(APPEND FFMPEGTHUMBNAILER_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})
+ LIST(APPEND FFMPEGTHUMBNAILER_LIBRARIES ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
+ 
+-SET(FFMPEGTHUMBNAILER_PKG_LIBS "-L${AVCODEC_PKG_LIBRARY_DIRS} -l${AVCODEC_PKG_LIBRARIES} -l${AVUTIL_PKG_LIBRARIES} -l${AVFORMAT_PKG_LIBRARIES} -l${SWSCALE_PKG_LIBRARIES}")
++SET(FFMPEGTHUMBNAILER_PKG_LIBS "-l${AVCODEC_PKG_LIBRARIES} -l${AVUTIL_PKG_LIBRARIES} -l${AVFORMAT_PKG_LIBRARIES} -l${SWSCALE_PKG_LIBRARIES}")
+ FOREACH(VAL ${JPEG_LIBRARIES})
+     SET(FFMPEGTHUMBNAILER_PKG_LIBS "${FFMPEGTHUMBNAILER_PKG_LIBS} ${VAL}")
+ ENDFOREACH()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpegthumbnailer.git/commitdiff/0e801e1dcf505189df772289926fd1aee418e389