[packages/gnome-shell] - don't package evolution-calendar.desktop (already in evolution.spec) - rel. 2

[wiget]

commit 2d8a9ea1957d0cd899d6c156e405a8733ba145c2
Author: Artur Frysiak <artur at frysiak.net>
Date:   Fri Oct 5 18:51:40 2012 +0200

    - don't package evolution-calendar.desktop (already in evolution.spec)
    - rel. 2

 gnome-shell.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gnome-shell.spec b/gnome-shell.spec
index ffb7bce..5f4e79f 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -5,7 +5,7 @@
 Summary:	Window manager and application launcher for GNOME
 Name:		gnome-shell
 Version:	3.6.0
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.6/%{name}-%{version}.tar.xz
@@ -140,6 +140,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-shell/{extensions,search-providers}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/*.la \
 	$RPM_BUILD_ROOT%{_browserpluginsdir}/*.la
+# evolution already ships this file
+%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/evolution-calendar.desktop
 
 %find_lang %{name}
 
@@ -184,7 +186,6 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
 %{_datadir}/gnome-shell
-%{_desktopdir}/evolution-calendar.desktop
 %{_desktopdir}/gnome-shell.desktop
 %{_desktopdir}/gnome-shell-extension-prefs.desktop
 %{_mandir}/man1/gnome-shell.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-shell.git/commitdiff/2d8a9ea1957d0cd899d6c156e405a8733ba145c2