[gnome-desktop3] require new enough gsettings-desktop-schemas

Matthias Clasen mclasen at fedoraproject.org
Mon Jan 10 16:03:43 UTC 2011


commit 3c9a700f5a6c7fc5ff20128ca5d2edf6cf4c97c9
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Jan 10 11:03:12 2011 -0500

    require new enough gsettings-desktop-schemas

 gnome-desktop3.spec |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index cda4c5c..07441a3 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -4,6 +4,7 @@
 %define startup_notification_version      0.5
 %define gnome_doc_utils_version           0.3.2
 %define gtk_doc_version                   1.9
+%define gsettings_desktop_schemas_version 0.1.4
 %define po_package                        gnome-desktop-3.0
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
@@ -26,7 +27,7 @@ Requires: system-backgrounds-gnome
 BuildRequires: gnome-common
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gsettings-desktop-schemas-devel
+BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
 BuildRequires: GConf2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
@@ -78,12 +79,6 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
-# conflicts with the original gnome-desktop, but we might switchroo in a few weeks time
-rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-about 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-about.desktop 
-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
 
 %post -p /sbin/ldconfig


More information about the scm-commits mailing list