avoid file conflict

This commit is contained in:
Matthias Clasen 2010-08-19 19:18:33 -04:00
parent 555558ba6d
commit e28904af54

View File

@ -9,7 +9,7 @@
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop3 Name: gnome-desktop3
Version: 2.90.4 Version: 2.90.4
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.90/gnome-desktop-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-desktop/2.90/gnome-desktop-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
@ -81,6 +81,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-about rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-about
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-about.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-about.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-about rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-about
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gnome-about*
%find_lang %{po_package} --all-name --with-gnome %find_lang %{po_package} --all-name --with-gnome
@ -110,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-about
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/ %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%changelog %changelog
* Thu Aug 19 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-2
- Prevent file conflict with gnome-desktop
* Tue Jun 29 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-1 * Tue Jun 29 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-1
- Update to 2.90.4 - Update to 2.90.4