From da8b3fff1983f681e8a0ba7b100330011c22f26c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:47:26 +0100 Subject: [PATCH] fix kde4 version requirement for marble [release 4.9.0-2mamba;Thu May 14 2015] --- digikam.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/digikam.spec b/digikam.spec index 4ec2f4a..39fba46 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ %define libname lib%{name} Name: digikam -Version: 4.6.0 -Release: 1mamba +Version: 4.9.0 +Release: 2mamba Summary: An advanced digital photo management application Linux, Windows and Mac-OSX Group: Graphical Desktop/Applications/Graphics Vendor: openmamba @@ -12,6 +12,7 @@ URL: http://www.digikam.org Source: http://download.kde.org/stable/digikam/digikam-%{version}.tar.bz2 Patch0: %{name}-2.5.0-libkipi-4.7.4.patch License: GPL + ## AUTOBUILDREQ-BEGIN BuildRequires: baloo-devel BuildRequires: glibc-devel @@ -79,7 +80,7 @@ BuildRequires: libmarble-devel >= 4.14 BuildRequires: libgphoto2-devel >= 1:2.5 Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} Requires: kipi-plugins = %{?epoch:%epoch:}%{version}-%{release} -Requires: kdelibs4 >= %{_kde4_version} +Requires: kdelibs >= %{_kde4_version} Requires: libqt4-sqlite >= %{_qt4_version} Requires: dcraw Requires: marble @@ -117,7 +118,7 @@ Requires: libkface = %{?epoch:%epoch:}%{version}-%{release} %package -n libkgeomap Group: Graphical Desktop/Libraries/KDE Summary: A world map library -Requires: marble%{?_kde4_version: >= %{_kde4_version}} +Requires: marble >= 4.14.3 %description -n libkgeomap %{summary}. @@ -269,8 +270,7 @@ rm -f %{buildroot}%{_kde4_icondir}/*/scalable/apps/showfoto.svgz # FIXME: as fo 3.1.0/kde 4.10 conflicting with kde-l10n rm -f %{buildroot}%{_kde4_localedir}/*/LC_MESSAGES/libkipi.mo -%find_lang libkgeomap -#% find_lang libkipi +#% find_lang libkgeomap %find_lang %{name} --with-kde %find_lang kipiplugins @@ -379,7 +379,7 @@ done %post -n libkgeomap -p /sbin/ldconfig %postun -n libkgeomap -p /sbin/ldconfig -%files -n libkgeomap -f libkgeomap.lang +%files -n libkgeomap %defattr(-,root,root) #%{_kde4_bindir}/libkgeomap_demo %{_kde4_datadir}/libkgeomap/ @@ -472,6 +472,15 @@ done %{_kde4_libdir}/libkipiplugins.so.* %changelog +* Thu May 14 2015 Silvan Calarco 4.9.0-2mamba +- fix kde4 version requirement for marble + +* Mon Apr 27 2015 Silvan Calarco 4.9.0-1mamba +- update to 4.9.0 + +* Fri Feb 13 2015 Silvan Calarco 4.7.0-1mamba +- update to 4.7.0 + * Sun Dec 21 2014 Automatic Build System 4.6.0-1mamba - automatic version update by autodist