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

Updating link to change in openSUSE:Factory/digikam revision 137.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=fb88e0d49562352c34c92ac269741ad2
This commit is contained in:
OBS User buildservice-autocommit 2015-05-11 17:32:08 +00:00 committed by Git OBS Bridge
parent b2a9b51782
commit bfb5ba16c6
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 28 14:46:24 UTC 2015 - tittiatcoke@gmail.com
- For Tumbleweed start using the libkgeomap that is provide with
KDE Applications.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 8 23:23:47 UTC 2015 - nico.kruber@gmail.com Wed Apr 8 23:23:47 UTC 2015 - nico.kruber@gmail.com

20
digikam.spec
View File

@ -46,6 +46,9 @@ BuildRequires: flex
BuildRequires: gdk-pixbuf-devel BuildRequires: gdk-pixbuf-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
%if 0%{?suse_version} > 1320
BuildRequires: libkgeomap-devel
%endif
%if 0%{?suse_version} > 1310 %if 0%{?suse_version} > 1310
BuildRequires: baloo-devel BuildRequires: baloo-devel
%endif %endif
@ -165,6 +168,7 @@ Supplements: packageand(kipi-plugins:marble)
A set of plug-ins for the KDE KIPI interface, used by some KDE imaging A set of plug-ins for the KDE KIPI interface, used by some KDE imaging
applications. applications.
%if 0%{?suse_version} <= 1320
%package -n libkgeomap-devel %package -n libkgeomap-devel
Summary: Development files for libkgeomap Summary: Development files for libkgeomap
License: GPL-2.0+ License: GPL-2.0+
@ -194,6 +198,7 @@ Currently supported map engine are:
- OpenstreetMap (via Marble) - OpenstreetMap (via Marble)
- GoogleMap - GoogleMap
This library is used by kipi-plugins, digiKam and other kipi host programs. This library is used by kipi-plugins, digiKam and other kipi host programs.
%endif
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1320
%package -n libkface-devel %package -n libkface-devel
@ -245,11 +250,16 @@ This package contains the development files for libmediawiki.
%lang_package -n kipi-plugins %lang_package -n kipi-plugins
%if 0%{?suse_version} <= 1320
%lang_package -n libkgeomap %lang_package -n libkgeomap
%endif
%prep %prep
%setup -q -n %{name}-%{rversion} %setup -q -n %{name}-%{rversion}
%if 0%{?suse_version} <= 1320
# Don't unpack the libkgeomap translations for Tumbleweed as that they are being delivered through kde-l10n
tar -xjf %{SOURCE2} tar -xjf %{SOURCE2}
%endif
%patch0 %patch0
%patch3 %patch3
%patch5 %patch5
@ -273,7 +283,11 @@ EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE"
%else %else
EXTRA_FLAGS="-DENABLE_LCMS2=ON" EXTRA_FLAGS="-DENABLE_LCMS2=ON"
%endif %endif
%if 0%{?suse_version} <= 1320
%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=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
%else
%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS
%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_jobs VERBOSE=1 %make_jobs VERBOSE=1
@ -300,7 +314,9 @@ rm -fv %{buildroot}%{_kde4_libdir}/*.a
%find_lang %{name} %find_lang %{name}
%if 0%{?suse_version} <= 1320
%find_lang libkgeomap libkgeomap.lang %find_lang libkgeomap libkgeomap.lang
%endif
%if 0%{?kde_updatedapps} %if 0%{?kde_updatedapps}
%find_lang libkipi libkipi.lang %find_lang libkipi libkipi.lang
@ -338,9 +354,11 @@ popd
%postun -n kipi-plugins -p /sbin/ldconfig %postun -n kipi-plugins -p /sbin/ldconfig
%if 0%{?suse_version} <= 1320
%post -n libkgeomap2 -p /sbin/ldconfig %post -n libkgeomap2 -p /sbin/ldconfig
%postun -n libkgeomap2 -p /sbin/ldconfig %postun -n libkgeomap2 -p /sbin/ldconfig
%endif
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1320
%post -n libkface3 -p /sbin/ldconfig %post -n libkface3 -p /sbin/ldconfig
@ -450,6 +468,7 @@ popd
%{_kde4_modulesdir}/kipiplugin_gpssync.so %{_kde4_modulesdir}/kipiplugin_gpssync.so
%{_kde4_servicesdir}/kipiplugin_gpssync.desktop %{_kde4_servicesdir}/kipiplugin_gpssync.desktop
%if 0%{?suse_version} <= 1320
%files -n libkgeomap-devel %files -n libkgeomap-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} %doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO}
@ -465,6 +484,7 @@ popd
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_kde4_appsdir}/libkgeomap/ %{_kde4_appsdir}/libkgeomap/
%{_kde4_libdir}/libkgeomap.so.2* %{_kde4_libdir}/libkgeomap.so.2*
%endif
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1320
%files -n libkface3 %files -n libkface3