aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2006-09-21 10:20:16 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2006-09-21 10:20:16 +0000
commite9e69bc12ada23d7101eb7ed0ad6ac6aecfc45a3 (patch)
tree9cbc6edac5712c77f38d36e87e16a3cd6b195824
parent279b98eea14e854f8c54c46a844dde289ffd3f2a (diff)
downloadcommon-data-e9e69bc12ada23d7101eb7ed0ad6ac6aecfc45a3.tar
common-data-e9e69bc12ada23d7101eb7ed0ad6ac6aecfc45a3.tar.gz
common-data-e9e69bc12ada23d7101eb7ed0ad6ac6aecfc45a3.tar.bz2
common-data-e9e69bc12ada23d7101eb7ed0ad6ac6aecfc45a3.tar.xz
common-data-e9e69bc12ada23d7101eb7ed0ad6ac6aecfc45a3.zip
- Hide more applications in one products
- Increase version for Conflicts (Mdv bug #26043)
-rw-r--r--desktop-common-data.spec8
-rw-r--r--menu/mandriva-discovery.menu7
2 files changed, 13 insertions, 2 deletions
diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index d9d4d40..62e7655 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 15
+Release: %mkrel 16
License: GPL
URL: http://www.mandrivalinux.com/
Group: System/Configuration/Other
@@ -28,7 +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
+Conflicts: kdelibs-common < 30000000:3.5.2
%description
This package contains useful icons, menu structure and others goodies for the
@@ -212,6 +212,10 @@ rm -fr %buildroot
%changelog
+* Thu Sep 21 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-16mdv2007.0
+- Hide more applications in one products
+- Increase version for Conflicts (Mdv bug #26043)
+
* Tue Sep 19 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-15mdv2007.0
- Fix error in upstream category in main menu
- add mandriva-discovery.menu additional menu file to hide / sort applications
diff --git a/menu/mandriva-discovery.menu b/menu/mandriva-discovery.menu
index 11937ad..6b975c9 100644
--- a/menu/mandriva-discovery.menu
+++ b/menu/mandriva-discovery.menu
@@ -135,6 +135,13 @@
<Filename>kde-kjscmd.desktop</Filename>
<Filename>invest-chart.desktop</Filename>
<Filename>base2.0.desktop</Filename>
+ <Filename>kasumi.desktop</Filename>
+ </Exclude>
+ </Menu>
+ <Menu>
+ <Name>Documentation</Name>
+ <Exclude>
+ <Filename>monodoc.desktop</Filename>
</Exclude>
</Menu>
</Menu>