rpms/control-center/devel gio.patch, NONE, 1.1 control-center.spec, 1.319, 1.320

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	control-center.spec 
Added Files:
	gio.patch 
Log Message:
rebuild nautilus extensions


gio.patch:

--- NEW FILE gio.patch ---
diff -up gnome-control-center-2.21.4/vfs-methods/themus/Makefile.am.gio gnome-control-center-2.21.4/vfs-methods/themus/Makefile.am
--- gnome-control-center-2.21.4/vfs-methods/themus/Makefile.am.gio	2007-12-24 01:02:22.000000000 -0500
+++ gnome-control-center-2.21.4/vfs-methods/themus/Makefile.am	2007-12-24 01:02:31.000000000 -0500
@@ -13,7 +13,7 @@ bin_PROGRAMS = gnome-theme-thumbnailer t
 vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
 vfsmodule_LTLIBRARIES = libtheme-method.la
 
-nautilusdir = $(libdir)/nautilus/extensions-1.0
+nautilusdir = $(libdir)/nautilus/extensions-2.0
 nautilus_LTLIBRARIES = libnautilus-themus.la
 
 libtheme_method_la_LDFLAGS = -module -avoid-version \
diff -up gnome-control-center-2.21.4/vfs-methods/fontilus/Makefile.am.gio gnome-control-center-2.21.4/vfs-methods/fontilus/Makefile.am
--- gnome-control-center-2.21.4/vfs-methods/fontilus/Makefile.am.gio	2007-12-24 01:01:21.000000000 -0500
+++ gnome-control-center-2.21.4/vfs-methods/fontilus/Makefile.am	2007-12-24 01:01:31.000000000 -0500
@@ -19,7 +19,7 @@ gnome_thumbnail_font_SOURCES = ftstream-
 gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS)
 gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
 
-nautilusdir = $(libdir)/nautilus/extensions-1.0
+nautilusdir = $(libdir)/nautilus/extensions-2.0
 nautilus_LTLIBRARIES = libnautilus-fontilus.la
 libnautilus_fontilus_la_LDFLAGS = -module -avoid-version \
   -export-symbols-regex 'nautilus_module_.*'


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- control-center.spec	21 Dec 2007 17:25:00 -0000	1.319
+++ control-center.spec	24 Dec 2007 06:09:23 -0000	1.320
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.21.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -48,6 +48,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=504182
 Patch100: im-setting.patch
 
+Patch101: gio.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -174,6 +176,7 @@
 %patch99 -p1 -b .default-apps
 
 %patch100 -p1 -b .im-setting
+%patch101 -p1 -b .gio
 
 %build
 
@@ -340,7 +343,7 @@
 %{_bindir}/gnome-window-properties
 %{_bindir}/themus-theme-applier
 %{_libexecdir}/gnome-settings-daemon
-%{_libdir}/nautilus/extensions-1.0/*
+%{_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
@@ -370,6 +373,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Dec 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.4-2
+- Rebuild nautilus extensions against new nautilus
+
 * Fri Dec 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.4-1
 - Update to 2.21.4