diff --git a/digikam.changes b/digikam.changes index fb94e81..018e894 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 1 19:31:46 UTC 2013 - hrvoje.senjan@gmail.com + +- Pass the correct ImageMagick cmake flag for >= 13.1 + ------------------------------------------------------------------- Tue May 14 21:53:56 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/digikam.spec b/digikam.spec index b673abd..e9de15d 100644 --- a/digikam.spec +++ b/digikam.spec @@ -261,12 +261,16 @@ popd %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