rpms/redhat-menus/devel redhat-menus-8.9.11-pirut.patch, NONE, 1.1 redhat-menus.spec, 1.89, 1.90
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sat Mar 15 01:55:04 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4176
Modified Files:
redhat-menus.spec
Added Files:
redhat-menus-8.9.11-pirut.patch
Log Message:
Remove special handling for pirut
redhat-menus-8.9.11-pirut.patch:
--- NEW FILE redhat-menus-8.9.11-pirut.patch ---
diff -up redhat-menus-8.9.11/menus/applications.menu.pirut redhat-menus-8.9.11/menus/applications.menu
--- redhat-menus-8.9.11/menus/applications.menu.pirut 2008-03-14 21:32:14.000000000 -0400
+++ redhat-menus-8.9.11/menus/applications.menu 2008-03-14 21:39:07.000000000 -0400
@@ -18,9 +18,6 @@
<!-- Add stock tarball installs to menus -->
<AppDir>/usr/local/share/applications</AppDir>
- <!-- Add a separator after the submenus -->
- <Layout><Merge type="menus"/><Separator/><Merge type="files"/></Layout>
-
<!-- Accessories submenu -->
<Menu>
<Name>Accessories</Name>
@@ -125,10 +122,6 @@
<Not><Category>Screensaver</Category></Not>
</And>
</Include>
-
- <Exclude>
- <Filename>pirut.desktop</Filename>
- </Exclude>
</Menu> <!-- End System Tools -->
<!-- Other -->
@@ -147,10 +140,6 @@
</Include>
</Menu> <!-- End Other -->
- <Include>
- <Filename>pirut.desktop</Filename>
- </Include>
-
<MergeFile>applications-kmenuedit.menu</MergeFile>
<!-- Read in overrides and child menus from applications.d -->
Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- redhat-menus.spec 6 Jan 2008 00:34:55 -0000 1.89
+++ redhat-menus.spec 15 Mar 2008 01:54:29 -0000 1.90
@@ -4,7 +4,7 @@
Summary: Configuration and data files for the desktop menus
Name: redhat-menus
Version: 8.9.11
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.redhat.com
Source0: %{name}-%{version}.tar.gz
License: GPL+
@@ -25,6 +25,7 @@
Conflicts: evolution <= 2.4.1-5
Patch0: redhat-menus-8.9.11-evolution.patch
+Patch1: redhat-menus-8.9.11-pirut.patch
%description
@@ -35,6 +36,7 @@
%prep
%setup -q
%patch0 -p1 -b .evolution
+%patch1 -p1 -b .pirut
%build
intltoolize --force
@@ -78,6 +80,9 @@
%{_datadir}/desktop-directories/*.directory
%changelog
+* Fri Mar 14 2008 Matthias Clasen <mclasen at redhat.com> - 8.9.11-3
+- Remove special handling for pirut
+
* Sat Jan 5 2008 Matthew Barnes <mbarnes at redhat.com> - 8.9.11-2
- Send all Evolution bugs to the new BugBuddyBugs Bugzilla component.
(GNOME bug #507311)
More information about the fedora-extras-commits
mailing list