Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2015-01-21 22:13:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2015-01-05 04:43:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2015-01-22 00:50:55.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 15 14:09:02 UTC 2015 - tittiatcoke@gmail.com + +- libkface is now a separate package. Do not use the bundled + version on opensUSE 13.2 and higher. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.WlUUzH/_old 2015-01-22 00:50:57.000000000 +0100 +++ /var/tmp/diff_new_pack.WlUUzH/_new 2015-01-22 00:50:57.000000000 +0100 @@ -48,6 +48,9 @@ BuildRequires: baloo-devel %endif %if 0%{?suse_version} > 1310 +BuildRequires: libkface-devel +%endif +%if 0%{?suse_version} > 1310 BuildRequires: gstreamer-plugins-qt-devel %else BuildRequires: gstreamer-0_10-plugins-qt-devel @@ -188,6 +191,7 @@ - GoogleMap This library is used by kipi-plugins, digiKam and other kipi host programs. +%if 0%{?suse_version} < 1320 %package -n libkface-devel Summary: Development files for libkface License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT @@ -207,6 +211,7 @@ %description -n libkface3 Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures. +%endif %package -n libmediawiki1 Summary: Interface for MediaWiki based web services @@ -259,11 +264,12 @@ %build %if 0%{?suse_version} < 1320 -EXTRA_FLAGS="-DENABLE_LCMS2=OFF" +EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE" %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS +%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS + # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 @@ -331,9 +337,11 @@ %postun -n libkgeomap2 -p /sbin/ldconfig +%if 0%{?suse_version} < 1320 %post -n libkface3 -p /sbin/ldconfig %postun -n libkface3 -p /sbin/ldconfig +%endif %post -n libmediawiki1 -p /sbin/ldconfig @@ -453,6 +461,7 @@ %{_kde4_appsdir}/libkgeomap/ %{_kde4_libdir}/libkgeomap.so.2* +%if 0%{?suse_version} < 1320 %files -n libkface3 %defattr(-,root,root,-) %{_kde4_appsdir}/libkface @@ -466,6 +475,7 @@ %{_kde4_libdir}/pkgconfig/libkface.pc %dir %{_kde4_libdir}/cmake/Kface-3.5.0/ %{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake +%endif %files -n libmediawiki1 %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org