rpms/control-center/devel control-center.spec,1.198,1.199

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv953

Modified Files:
	control-center.spec 
Log Message:
fix a file conflict



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- control-center.spec	27 Oct 2006 22:47:34 -0000	1.198
+++ control-center.spec	8 Nov 2006 20:03:25 -0000	1.199
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.17.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -225,6 +225,9 @@
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.*a
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.*a
 
+# temporarly work around the file conflict with libgnomekbd
+rm $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas 
+
 %find_lang %{gettext_package}
 
 %clean
@@ -239,7 +242,6 @@
    %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
    %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \
    %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
-   %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas \
    %{_sysconfdir}/gconf/schemas/fontilus.schemas \
    %{_sysconfdir}/gconf/schemas/themus.schemas >& /dev/null
 update-desktop-database --quiet %{_datadir}/applications
@@ -316,6 +318,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.1-3
+- Work around a file conflict with libgnomekbd (#214608)
+
 * Fri Oct 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.17.1-2.fc7
 - Update BuildRequires for evolution-data-server-devel.
 - Rebuild against evolution-data-server-1.9.1.