aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Montel <lmontel@mandriva.org>2006-08-31 15:33:33 +0000
committerLaurent Montel <lmontel@mandriva.org>2006-08-31 15:33:33 +0000
commit56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f (patch)
treebb325dc8949f6d832f68380f2560e58e9d89aedb
parent432d1de4ad59dde5dd9a5f28f1148319e59e5745 (diff)
downloadcommon-data-56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f.tar
common-data-56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f.tar.gz
common-data-56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f.tar.bz2
common-data-56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f.tar.xz
common-data-56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f.zip
Fix upgrade from 2006
-rw-r--r--desktop-common-data.spec6
1 files changed, 5 insertions, 1 deletions
diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index 223053d..2bf77c1 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -3,7 +3,7 @@
Summary: Desktop common files
Name: desktop-common-data
Version: 2007
-Release: %mkrel 9
+Release: %mkrel 10
License: GPL
URL: http://www.mandrivalinux.com/
Group: System/Configuration/Other
@@ -28,6 +28,7 @@ Provides: menu-xdg
Provides: menu = 2.1.24
Requires: xinitrc >= 2.4.12
Requires: mdk-menu-messages >= 10.2-7mdk
+Conflicts: kdelibs-common < 30000000:3.5
%description
This package contains useful icons, menu structure and others goodies for the
@@ -192,6 +193,9 @@ rm -fr %buildroot
%changelog
+* Thu Aug 31 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-10mdv2007.0
+- Fix upgrade from 2006
+
* Wed Aug 30 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-9mdv2007.0
- update-menus doesn't do anything if DURING_INSTALL is set to 1