[gnome-desktop/f15/master] Do not ship /usr/share/omf/gpl as they are already shipped in gnome-desktop3 and now differ between

[Richard Hughes]

commit 20e7a4f31c97c3252a452946800ba571a077996b
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Mar 8 12:37:05 2011 +0000

    Do not ship /usr/share/omf/gpl as they are already shipped in
    gnome-desktop3 and now differ between versions.

 gnome-desktop.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 991a8ec..7cd6c9a 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -3,7 +3,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.32.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-desktop
 Source0: http://download.gnome.org/sources/gnome-desktop/2.32/%{name}-%{version}.tar.bz2
@@ -60,6 +60,12 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 # stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
+# already shipped in gnome-desktop3
+rm -rf $RPM_BUILD_ROOT/usr/share/omf/gpl
+rm -rf $RPM_BUILD_ROOT/usr/share/omf/lgpl
+rm -rf $RPM_BUILD_ROOT/usr/share/gnome/help/gpl
+rm -rf $RPM_BUILD_ROOT/usr/share/gnome/help/lgpl
+
 %find_lang %{po_package} --all-name --with-gnome
 
 %post -p /sbin/ldconfig
@@ -86,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 %doc %{_datadir}/gtk-doc
 
 %changelog
+* Tue Mar 08 2011 Richard Hughes <rhughes at redhat.com> 2.32.0-7
+- Do not ship /usr/share/omf/gpl as they are already shipped in
+  gnome-desktop3 and now differ between versions.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild