- up to 0.8.2

[packages/digikam.git] / digikam.spec

diff --git a/digikam.spec b/digikam.spec
index 9ee85f3a69cfb4e2ffd626fc3e800a1d88c8938f..bd0daca8eb4a03b8be82771756a68ddd2e62386d 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,12 +1,12 @@
 Summary:       A KDE frontend for gphoto2
 Summary(pl):   Interfejs KDE do gphoto2
 Name:          digikam
-Version:       0.8.1
+Version:       0.8.2
 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5: 2672c510a78256a034a666f0e237eb3f
+# Source0-md5: fd57b7bfe4577dc2e2efd6d33122a46b
 URL:           http://digikam.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -47,9 +47,6 @@ Interfejs KDE do gphoto2 - pliki nag
 
 %prep
 %setup -q
-
-%build
-
 %{__sed} -i -e "s,Categories.*,Categories=Qt;KDE;Graphics;Photograph;," \
        ./digikam/digikam/digikam.desktop \
        ./digikam/showfoto/showfoto.desktop
@@ -59,6 +56,7 @@ echo "# vi: encoding=utf-8" >> ./digikam/imageplugins/digikamimageplugin_core.de
 echo "# vi: encoding=utf-8" >> ./digikam/utilities/imageeditor/digikamimageplugin.desktop
 echo "# vi: encoding=utf-8" >> ./digikam/showfoto/mimetypes/x-raw.desktop
 
+%build
 cp -f /usr/share/automake/config.sub admin
 %{__make} -f admin/Makefile.common cvs
 
@@ -81,6 +79,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/*.desktop $RPM_BUILD_ROOT%{_deskto
 
 %find_lang %{name} --with-kde --all-name
 
+# conflict with kdelibs
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/image/x-raw.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -98,7 +99,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/*
 %{_datadir}/apps/digikam
 %{_datadir}/apps/showfoto
-%{_datadir}/mimelnk/image/*.desktop
 %{_desktopdir}/kde/*.desktop
 %{_iconsdir}/[!l]*/*/*/*