Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2013-06-11 06:06:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-05-16 15:32:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2013-06-11 09:26:35.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 1 19:31:46 UTC 2013 - hrvoje.senjan@gmail.com + +- Pass the correct ImageMagick cmake flag for >= 13.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.DDDNjQ/_old 2013-06-11 09:26:36.000000000 +0200 +++ /var/tmp/diff_new_pack.DDDNjQ/_new 2013-06-11 09:26:36.000000000 +0200 @@ -261,12 +261,16 @@ %build %if !0%{?kde_updatedapps} -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE +%if 0%{?suse_version} >= 1310 + EXTRA_FLAGS="-DImageMagick_MagickCore_INCLUDE_DIR:PATH=%{_includedir}/ImageMagick-6 \ + -DImageMagick_MagickCore_LIBRARY:FILEPATH=%{_libdir}/libMagickCore-6.Q8.so" +%endif +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE $EXTRA_FLAGS %else %cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=TRUE -DENABLE_INTERNALMYSQL=FALSE %endif # there are files in there that are so heavy to the compiler, that one is enough -%{__make} -j1 VERBOSE=1 +%make_jobs VERBOSE=1 %install %kde4_makeinstall -C build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org