rpms/control-center/devel make-default.patch,1.1,1.2

Sat May 3 04:21:29 UTC 2008

Author: mclasen

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

Modified Files:
	make-default.patch 
Log Message:
fix patch


make-default.patch:

Index: make-default.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- make-default.patch	3 May 2008 04:01:43 -0000	1.1
+++ make-default.patch	3 May 2008 04:20:49 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c.make-default	2008-05-02 23:43:45.000000000 -0400
-+++ gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c	2008-05-02 23:50:10.000000000 -0400
+--- gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c.make-default	2008-05-03 00:18:56.000000000 -0400
++++ gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c	2008-05-03 00:18:56.000000000 -0400
 @@ -31,6 +31,9 @@
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnomeui/gnome-bg.h>
@@ -99,9 +99,9 @@
  
  void
 diff -up gnome-control-center-2.23.1/capplets/appearance/Makefile.am.make-default gnome-control-center-2.23.1/capplets/appearance/Makefile.am
---- gnome-control-center-2.23.1/capplets/appearance/Makefile.am.make-default	2008-05-02 23:50:20.000000000 -0400
-+++ gnome-control-center-2.23.1/capplets/appearance/Makefile.am	2008-05-02 23:53:37.000000000 -0400
-@@ -66,3 +66,14 @@ INCLUDES = \
+--- gnome-control-center-2.23.1/capplets/appearance/Makefile.am.make-default	2008-04-21 11:26:34.000000000 -0400
++++ gnome-control-center-2.23.1/capplets/appearance/Makefile.am	2008-05-03 00:19:18.000000000 -0400
+@@ -61,3 +61,14 @@ INCLUDES = \
  	-DWALLPAPER_DATADIR="\"$(wallpaperdir)\""
  
  CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
@@ -113,12 +113,12 @@
 +polkit_DATA = $(polkit_in_files:.policy.in=.policy)
 +
 +check:
-+        $(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
++	$(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
 +
 +EXTRA_DIST = $(polkit_in_files)
-diff -up gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in.make-default gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in
---- gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in.make-default	2008-05-02 23:49:43.000000000 -0400
-+++ gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in	2008-05-02 23:57:52.000000000 -0400
+diff -up /dev/null gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in
+--- /dev/null	2008-05-02 17:32:00.296272090 -0400
++++ gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in	2008-05-03 00:18:56.000000000 -0400
 @@ -0,0 +1,20 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE policyconfig PUBLIC
@@ -141,8 +141,8 @@
 +
 +</policyconfig>
 diff -up gnome-control-center-2.23.1/configure.in.make-default gnome-control-center-2.23.1/configure.in
---- gnome-control-center-2.23.1/configure.in.make-default	2008-05-02 23:43:45.000000000 -0400
-+++ gnome-control-center-2.23.1/configure.in	2008-05-02 23:43:45.000000000 -0400
+--- gnome-control-center-2.23.1/configure.in.make-default	2008-05-03 00:18:56.000000000 -0400
++++ gnome-control-center-2.23.1/configure.in	2008-05-03 00:18:56.000000000 -0400
 @@ -105,6 +105,7 @@ PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.1
  PKG_CHECK_MODULES(LIBBACKGROUND, glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0)
  PKG_CHECK_MODULES(LIBSOUNDS, gio-2.0 libgnome-2.0 libgnomeui-2.0)
@@ -151,9 +151,17 @@
  
  gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
  gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
+@@ -256,6 +257,7 @@ if test x$enable_vfs_methods = xyes; the
+     FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"`
+     FONT_METHOD_LIBS=`echo $FONT_METHOD_LIBS | sed -e "s/$export_dynamic//"`
+   fi
++  PKG_CHECK_MODULES(EEL, eel-2.0)
+ fi
+ 
+ dnl ==============================================
 diff -up gnome-control-center-2.23.1/po/POTFILES.in.make-default gnome-control-center-2.23.1/po/POTFILES.in
---- gnome-control-center-2.23.1/po/POTFILES.in.make-default	2008-05-02 23:54:01.000000000 -0400
-+++ gnome-control-center-2.23.1/po/POTFILES.in	2008-05-02 23:54:51.000000000 -0400
+--- gnome-control-center-2.23.1/po/POTFILES.in.make-default	2008-01-29 07:56:35.000000000 -0500
++++ gnome-control-center-2.23.1/po/POTFILES.in	2008-05-03 00:18:56.000000000 -0400
 @@ -21,6 +21,7 @@ capplets/appearance/data/gnome-theme-ins
  capplets/appearance/data/gnome-theme-package.xml.in
  capplets/appearance/gnome-wp-info.c


