rpms/redhat-menus/devel .cvsignore, 1.27, 1.28 redhat-menus.spec, 1.43, 1.44 sources, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24521

Modified Files:
	.cvsignore redhat-menus.spec sources 
Log Message:
* Tue Oct 25 2005 David Malcolm <dmalcolm at redhat.com> - 5.0.4-1
- Split the evolution desktop file into four separate ones: one per component.
  Force people to update evolution, to avoid it using a stale symlink. 
  (#170799).




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	21 Oct 2005 16:16:56 -0000	1.27
+++ .cvsignore	25 Oct 2005 23:13:55 -0000	1.28
@@ -1,2 +1 @@
-redhat-menus-5.0.1.tar.gz
-redhat-menus-5.0.2.tar.gz
+redhat-menus-5.0.4.tar.gz


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- redhat-menus.spec	21 Oct 2005 16:16:56 -0000	1.43
+++ redhat-menus.spec	25 Oct 2005 23:13:55 -0000	1.44
@@ -3,7 +3,7 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 5.0.2
+Version: 5.0.4
 Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -19,6 +19,8 @@
 Conflicts: nautilus <= 2.0.3-1
 ## desktop files in redhat-menus point to icons in new artwork
 Conflicts: redhat-artwork < 0.35
+## old evolution packages point to a no-longer-existing symlink
+Conflicts: evolution <= 2.4.1-5
 
 %description
 
@@ -63,6 +65,11 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Tue Oct 25 2005 David Malcolm <dmalcolm at redhat.com> - 5.0.4-1
+- Split the evolution desktop file into four separate ones: one per component.
+  Force people to update evolution, to avoid it using a stale symlink. 
+  (#170799).
+
 * Fri Oct 21 2005 Matthias Clasen <mclasen at redhat.com> 5.0.2-1
 - Hide gfloppy by default
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 Oct 2005 16:16:56 -0000	1.28
+++ sources	25 Oct 2005 23:13:55 -0000	1.29
@@ -1 +1 @@
-1f2846e41f4280790bde1921069cb3cd  redhat-menus-5.0.2.tar.gz
+0cff6b3449b70112713eee8801d46a6d  redhat-menus-5.0.4.tar.gz