SPECS: digikam.spec - rel 2; drop x-raw.desktop; conflicting with ...
arekm
arekm at pld-linux.org
Wed Apr 12 00:59:46 CEST 2006
Author: arekm Date: Tue Apr 11 22:59:46 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 2; drop x-raw.desktop; conflicting with kdelibs
---- Files affected:
SPECS:
digikam.spec (1.48 -> 1.49)
---- Diffs:
================================================================
Index: SPECS/digikam.spec
diff -u SPECS/digikam.spec:1.48 SPECS/digikam.spec:1.49
--- SPECS/digikam.spec:1.48 Thu Mar 9 10:11:40 2006
+++ SPECS/digikam.spec Wed Apr 12 00:59:41 2006
@@ -3,7 +3,7 @@
Summary(pl): Interfejs KDE do gphoto2
Name: digikam
Version: 0.8.1
-Release: 1
+Release: 2
License: GPL
Group: X11/Applications
Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
@@ -80,6 +80,9 @@
%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
@@ -97,7 +100,6 @@
%{_datadir}/servicetypes/*
%{_datadir}/apps/digikam
%{_datadir}/apps/showfoto
-%{_datadir}/mimelnk/image/*.desktop
%{_desktopdir}/kde/*.desktop
%{_iconsdir}/[!l]*/*/*/*
@@ -114,6 +116,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.49 2006/04/11 22:59:41 arekm
+- rel 2; drop x-raw.desktop; conflicting with kdelibs
+
Revision 1.48 2006/03/09 09:11:40 glen
- altering source moved to %prep
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.48&r2=1.49&f=u
More information about the pld-cvs-commit
mailing list