diff --git a/digikam.changes b/digikam.changes index a778c02..dd592c3 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Nov 15 18:36:36 UTC 2011 - ctrippe@opensuse.org + +- Require libqt4-sql-sqlite and libqt4-sql-mysql (bnc#730111) + +------------------------------------------------------------------- +Sat Nov 12 23:08:30 UTC 2011 - asterios.dramis@gmail.com + +- Spec file updates: + * Removed %kde4_pimlibs_requires (fix for rpmlint warning + "suse-kde4-excessive-dependency"). + * Don't install the libkgeomap translations (they belong to libkgeomap + package). + ------------------------------------------------------------------- Tue Nov 8 11:03:03 UTC 2011 - idonmez@suse.com diff --git a/digikam.spec b/digikam.spec index 41150f8..c79d47b 100644 --- a/digikam.spec +++ b/digikam.spec @@ -51,11 +51,12 @@ BuildRequires: shared-desktop-ontologies-devel BuildRequires: update-desktop-files %endif Requires: kipi-plugins >= 2.1.0 +Requires: libqt4-sql-sqlite +Requires: libqt4-sql-mysql Recommends: %{name}-doc Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires -%kde4_pimlibs_requires %description digiKam is a simple digital photo management application for KDE, which @@ -76,10 +77,13 @@ This package contains the documentation for digikam %lang_package %prep %setup -q -rm po/*/kipi* %patch0 %patch1 +# Include only digikam translations +find po -name kipiplugin_*.po | xargs rm +find po -name libkgeomap.po | xargs rm + # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" core/digikam/utils/version.h.cmake @@ -93,6 +97,7 @@ cd build %kde4_makeinstall cd .. +# Remove kipi-plugins docs (included in kipi-plugins package) rm -rf %{buildroot}%{_kde4_htmldir}/en/kipi-plugins # Not needed, the package doesn't actually provide any shared libraries @@ -100,18 +105,20 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so # Workaround kde#286034 -mv %{buildroot}/usr/share/icons/oxygen %{buildroot}/usr/share/icons/hicolor +mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Qt KDE Graphics Photography %suse_update_desktop_file -G "Photo Editor" -r showfoto Qt KDE Graphics Photography %endif -%find_lang %{name} --all-name +%find_lang %{name} + %fdupes -s %{buildroot} + %kde_post_install -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig