rpms/control-center/devel .cvsignore, 1.67, 1.68 control-center.spec, 1.322, 1.323 sources, 1.70, 1.71

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29809

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
* Thu Jan 17 2008 - Bastien Nocera <bnocera at redhat.com> - 2.21.5-1
- Update to 2.21.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	21 Dec 2007 06:21:38 -0000	1.67
+++ .cvsignore	17 Jan 2008 19:02:41 -0000	1.68
@@ -1 +1 @@
-gnome-control-center-2.21.4.tar.bz2
+gnome-control-center-2.21.5.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- control-center.spec	11 Jan 2008 11:20:49 -0000	1.322
+++ control-center.spec	17 Jan 2008 19:02:41 -0000	1.323
@@ -21,8 +21,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.21.4
-Release: 3%{?dist}
+Version: 2.21.5
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -60,6 +60,7 @@
 Conflicts: desktop-backgrounds-basic < 2.0-27
 Conflicts: desktop-backgrounds-extended < 2.0-27
 
+Requires: gnome-settings-daemon
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
 Requires: libgail-gnome
@@ -97,6 +98,7 @@
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: gnome-panel-devel
 BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
+BuildRequires: gnome-settings-daemon
 # For intltool:
 BuildRequires: perl(XML::Parser) 
 BuildRequires: evolution-data-server-devel >= 1.9.1
@@ -251,10 +253,6 @@
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule 						\
-   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
-   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
-   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-   %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas	\
    %{_sysconfdir}/gconf/schemas/fontilus.schemas			\
    %{_sysconfdir}/gconf/schemas/control-center.schemas			\
    %{_sysconfdir}/gconf/schemas/themus.schemas				\
@@ -270,14 +268,8 @@
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-     %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
      %{_sysconfdir}/gconf/schemas/fontilus.schemas \
      %{_sysconfdir}/gconf/schemas/themus.schemas \
-     > /dev/null || :
-    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/control-center.schemas \
      > /dev/null || :
 fi
@@ -286,14 +278,8 @@
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas  \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-     %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
      %{_sysconfdir}/gconf/schemas/fontilus.schemas \
      %{_sysconfdir}/gconf/schemas/themus.schemas \
-     > /dev/null || :
-    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/control-center.schemas \
      > /dev/null || :
 fi
@@ -343,13 +329,8 @@
 %{_bindir}/gnome-typing-monitor
 %{_bindir}/gnome-window-properties
 %{_bindir}/themus-theme-applier
-%{_libexecdir}/gnome-settings-daemon
 %{_libdir}/nautilus/extensions-2.0/*.so
 %{_libdir}/*.so.*
-%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas  
-%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
-%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas
 %{_sysconfdir}/gconf/schemas/fontilus.schemas
 %{_sysconfdir}/gconf/schemas/themus.schemas
 %{_sysconfdir}/gconf/schemas/control-center.schemas
@@ -374,6 +355,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Jan 17 2008 - Bastien Nocera <bnocera at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
 * Fri Jan 11 2008 - Bastien Nocera <bnocera at redhat.com> - 2.21.4-3
 - Remove duplicated sylpheed entry (#428363)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	21 Dec 2007 06:21:38 -0000	1.70
+++ sources	17 Jan 2008 19:02:41 -0000	1.71
@@ -1 +1 @@
-0674531ced6f9322251d94c4ad3594a2  gnome-control-center-2.21.4.tar.bz2
+4de7124991cb34828009317a7e5f7c6a  gnome-control-center-2.21.5.tar.bz2