Hello community, here is the log from the commit of package libkface for openSUSE:Factory checked in at 2016-01-07 00:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkface (Old) and /work/SRC/openSUSE:Factory/.libkface.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkface" Changes: -------- --- /work/SRC/openSUSE:Factory/libkface/libkface.changes 2015-11-15 12:42:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkface.new/libkface.changes 2016-01-07 00:23:06.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Dec 13 13:31:23 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + +- Add patch fix-opencv.diff to ensure correct detection of opencv + +------------------------------------------------------------------- Old: ---- libkface-15.08.3.tar.xz New: ---- fix-opencv.diff libkface-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkface.spec ++++++ --- /var/tmp/diff_new_pack.QxAgme/_old 2016-01-07 00:23:08.000000000 +0100 +++ /var/tmp/diff_new_pack.QxAgme/_new 2016-01-07 00:23:08.000000000 +0100 @@ -15,57 +15,66 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define libname libKF5KFace +%define _so 10_0_0 Name: libkface -BuildRequires: libkde4-devel -BuildRequires: opencv-devel Summary: wrapper around LibFace to perform face recognition and detection over pictures License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz +Patch0: fix-opencv.diff +BuildRequires: opencv-qt5-devel +BuildRequires: extra-cmake-modules +BuildRequires: kconfig-devel +BuildRequires: kdelibs4support-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Xml) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures %prep %setup -q -n %{name}-%{version} +%patch0 -p0 %build - %cmake_kde4 -d build + %cmake_kf5 -d build -- -DENABLE_OPENCV3=false %make_jobs %install - cd build - %makeinstall - %kde_post_install + %kf5_makeinstall -C build %clean rm -rf $RPM_BUILD_ROOT -%package -n libkface3 -Summary: wrapper around LibFace to perform face recognition and detection over pictures +%package -n %{libname}%{_so} Group: Development/Libraries/KDE -Requires: libkface +Summary: wrapper around LibFace to perform face recognition and detection over pictures +Requires: %{name} = %{version} -%description -n libkface3 +%description -n %{libname}%{_so} Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures -%files -n libkface3 +%files -n %{libname}%{_so} %defattr(-,root,root) -%_kde4_libdir/libkface.so.* +%_kf5_libdir/%{libname}.so.* -%post -n libkface3 -p /sbin/ldconfig +%post -n %{libname}%{_so} -p /sbin/ldconfig -%postun -n libkface3 -p /sbin/ldconfig +%postun -n %{libname}%{_so} -p /sbin/ldconfig %package devel Summary: wrapper around LibFace to perform face recognition and detection over pictures Group: Development/Libraries/KDE -Requires: libkface3 = %version +Requires: %{libname}%{_so} = %version +Obsoletes: libkface-kf5-devel < %{version} +Provides: libkface-kf5-devel = %{version} %description devel Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures @@ -73,13 +82,13 @@ %files devel %defattr(-,root,root) %doc COPYING README -%_kde4_libdir/libkface.so -/usr/include/libkface/ -%_kde4_libdir/pkgconfig/libkface.pc -%_kde4_libdir/cmake/Kface-3.5.0/ +%_kf5_libdir/%{libname}.so +%_kf5_includedir/KFace/ +%_kf5_includedir/libkface_version.h +%{_kf5_libdir}/cmake/KF5KFace/ %files %defattr(-,root,root) -%_kde4_appsdir/libkface/ +%_kf5_appsdir/libkface/ %changelog ++++++ fix-opencv.diff ++++++ --- CMakeLists.txt 2015-10-09 15:39:10.809433233 +0200 +++ CMakeLists.txt 2015-10-09 15:39:10.809433233 +0200 @@ -96,12 +96,12 @@ set(OPENCV_MIN_VERSION "2.4.9") DETECT_OPENCV(${OPENCV_MIN_VERSION} core highgui objdetect contrib legacy imgproc) - if(${OpenCV_FOUND}) - if(${OpenCV_VERSION} VERSION_GREATER 2.4.99) - message(STATUS "ENABLE_OPENCV3 option is disabled and OpenCV >= 3.0.0 have been found. Enabled ENABLE_OPENCV3") - set(OpenCV_FOUND FALSE) - endif() - endif() +# if(${OpenCV_FOUND}) +# if(${OpenCV_VERSION} VERSION_GREATER 2.4.99) +# message(STATUS "ENABLE_OPENCV3 option is disabled and OpenCV >= 3.0.0 have been found. Enabled ENABLE_OPENCV3") +# set(OpenCV_FOUND FALSE) +# endif() +# endif() endif() ++++++ libkface-15.08.3.tar.xz -> libkface-15.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libkface/libkface-15.08.3.tar.xz /work/SRC/openSUSE:Factory/.libkface.new/libkface-15.12.0.tar.xz differ: char 26, line 1
