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 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 - 2.32.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild