pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 178241 from KDE:Distro:Factory

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/178241
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=112
This commit is contained in:
Stephan Kulow 2013-06-11 04:06:44 +00:00 committed by Git OBS Bridge
parent 806e3329db
commit 68cb58b8c4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
digikam.changes
View File

@ -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 Tue May 14 21:53:56 UTC 2013 - hrvoje.senjan@gmail.com

8
digikam.spec
View File

@ -261,12 +261,16 @@ popd
%build %build
%if !0%{?kde_updatedapps} %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 %else
%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=TRUE -DENABLE_INTERNALMYSQL=FALSE %cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=TRUE -DENABLE_INTERNALMYSQL=FALSE
%endif %endif
# there are files in there that are so heavy to the compiler, that one is enough # 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 %install
%kde4_makeinstall -C build %kde4_makeinstall -C build