rpms/control-center/devel make-default.patch,1.3,1.4

[Matthias Clasen (mclasen)]

Author: mclasen

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

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


make-default.patch:

Index: make-default.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- make-default.patch	3 May 2008 04:31:48 -0000	1.3
+++ make-default.patch	3 May 2008 04:44:17 -0000	1.4
@@ -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-03 00:28:42.000000000 -0400
-+++ gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c	2008-05-03 00:28:42.000000000 -0400
+--- gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c.make-default	2008-05-03 00:29:49.000000000 -0400
++++ gnome-control-center-2.23.1/capplets/appearance/appearance-desktop.c	2008-05-03 00:29:49.000000000 -0400
 @@ -31,6 +31,9 @@
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnomeui/gnome-bg.h>
@@ -100,8 +100,26 @@
  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-04-21 11:26:34.000000000 -0400
-+++ gnome-control-center-2.23.1/capplets/appearance/Makefile.am	2008-05-03 00:28:42.000000000 -0400
-@@ -61,3 +61,14 @@ INCLUDES = \
++++ gnome-control-center-2.23.1/capplets/appearance/Makefile.am	2008-05-03 00:42:39.000000000 -0400
+@@ -42,7 +42,8 @@ gnome_appearance_properties_LDADD = \
+ 	$(top_builddir)/capplets/common/libcommon.la \
+ 	$(GNOMECC_CAPPLETS_LIBS) \
+ 	$(FONT_CAPPLET_LIBS) \
+-	$(METACITY_LIBS)
++	$(METACITY_LIBS) \
++	$(POLKIT_GNOME_LIBS) 
+ gnome_appearance_properties_LDFLAGS = -export-dynamic
+ 
+ gladedir = $(pkgdatadir)/glade
+@@ -53,6 +54,7 @@ INCLUDES = \
+ 	$(METACITY_CFLAGS) \
+ 	$(GNOMECC_CAPPLETS_CFLAGS) \
+ 	$(FONT_CAPPLET_CFLAGS) \
++	$(POLKIT_GNOME_CFLAGS) \
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+ 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
+@@ -61,3 +63,14 @@ INCLUDES = \
  	-DWALLPAPER_DATADIR="\"$(wallpaperdir)\""
  
  CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
@@ -118,7 +136,7 @@
 +EXTRA_DIST = $(polkit_in_files)
 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:28:42.000000000 -0400
++++ gnome-control-center-2.23.1/capplets/appearance/org.gnome.gconf.defaults.policy.in	2008-05-03 00:29:49.000000000 -0400
 @@ -0,0 +1,20 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE policyconfig PUBLIC
@@ -141,8 +159,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-03 00:28:42.000000000 -0400
-+++ gnome-control-center-2.23.1/configure.in	2008-05-03 00:28:42.000000000 -0400
+--- gnome-control-center-2.23.1/configure.in.make-default	2008-05-03 00:29:49.000000000 -0400
++++ gnome-control-center-2.23.1/configure.in	2008-05-03 00:29:49.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)
@@ -153,7 +171,7 @@
  gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
 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-01-29 07:56:35.000000000 -0500
-+++ gnome-control-center-2.23.1/po/POTFILES.in	2008-05-03 00:28:42.000000000 -0400
++++ gnome-control-center-2.23.1/po/POTFILES.in	2008-05-03 00:29:49.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