rpms/control-center/devel control-center.spec, 1.458, 1.459 polkit1.patch, 1.3, 1.4

Matthias Clasen mclasen at fedoraproject.org
Thu Jul 30 02:52:51 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12722

Modified Files:
	control-center.spec polkit1.patch 
Log Message:
revert non-useful changes



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- control-center.spec	24 Jul 2009 19:28:35 -0000	1.458
+++ control-center.spec	30 Jul 2009 02:52:51 -0000	1.459
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.4
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -354,9 +354,6 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.27.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
 - Update to 2.27.4
 

polkit1.patch:
 capplets/about-me/gnome-about-me.c       |   33 ---------
 capplets/appearance/appearance-desktop.c |  104 ++++++++++++++++++++++---------
 configure.in                             |    5 -
 3 files changed, 75 insertions(+), 67 deletions(-)

Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/polkit1.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- polkit1.patch	16 Jul 2009 00:59:22 -0000	1.3
+++ polkit1.patch	30 Jul 2009 02:52:51 -0000	1.4
@@ -1,18 +1,7 @@
 diff -up gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c.polkit1 gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c.polkit1	2009-07-15 16:52:23.630080589 -0400
-+++ gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c	2009-07-15 16:52:23.668342168 -0400
-@@ -36,10 +36,6 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnomeui/gnome-desktop-thumbnail.h>
- 
--#ifdef HAVE_POLKIT
--#include <polkit-gnome/polkit-gnome.h>
--#endif
--
- #include "e-image-chooser.h"
- #include "eel-editable-label.h"
- #include <gdk/gdkkeysyms.h>
-@@ -169,28 +165,6 @@ about_me_error (GtkWindow *parent, gchar
+--- gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c.polkit1	2009-06-15 07:00:02.000000000 -0400
++++ gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c	2009-07-23 15:01:19.841482208 -0400
+@@ -167,28 +167,6 @@ about_me_error (GtkWindow *parent, gchar
  	gtk_widget_destroy (dialog);
  }
  
@@ -41,7 +30,7 @@ diff -up gnome-control-center-2.27.4/cap
  /********************/
  static void
  about_me_destroy (GnomeAboutMe *me)
-@@ -1194,19 +1168,8 @@ about_me_setup_dialog (void)
+@@ -1034,19 +1012,8 @@ about_me_setup_dialog (void)
  	g_signal_connect (widget, "clicked",
  			  G_CALLBACK (about_me_image_clicked_cb), me);
  
@@ -61,29 +50,9 @@ diff -up gnome-control-center-2.27.4/cap
  
  	g_signal_connect (me->enable_fingerprint_button, "clicked",
  			  G_CALLBACK (about_me_fingerprint_button_clicked_cb), me);
-diff -up gnome-control-center-2.27.4/capplets/about-me/Makefile.am.polkit1 gnome-control-center-2.27.4/capplets/about-me/Makefile.am
---- gnome-control-center-2.27.4/capplets/about-me/Makefile.am.polkit1	2009-07-15 16:52:23.634066013 -0400
-+++ gnome-control-center-2.27.4/capplets/about-me/Makefile.am	2009-07-15 16:52:23.669351794 -0400
-@@ -26,7 +26,7 @@ gnome_about_me_SOURCES =	 	\
- if BUILD_ABOUTME
- bin_PROGRAMS = gnome-about-me
- 
--gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) $(GAIL_LIBS)
-+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(GAIL_LIBS)
- gnome_about_me_LDFLAGS = -export-dynamic
- 
- @INTLTOOL_DESKTOP_RULE@
-@@ -40,7 +40,6 @@ glade_DATA = $(glade_files)
- INCLUDES = \
- 	$(GNOMECC_CAPPLETS_CFLAGS) \
- 	$(LIBEBOOK_CFLAGS) \
--	$(POLKIT_GNOME_CFLAGS) \
- 	$(GAIL_CFLAGS) \
- 	-DDATADIR="\"$(datadir)\"" \
- 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.polkit1 gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.polkit1	2009-07-15 16:52:23.658335935 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c	2009-07-15 16:52:23.670342213 -0400
+--- gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.polkit1	2009-07-23 15:01:19.833483423 -0400
++++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c	2009-07-23 15:01:19.842481776 -0400
 @@ -32,7 +32,6 @@
  #include <libgnomeui/gnome-bg.h>
  
@@ -234,19 +203,10 @@ diff -up gnome-control-center-2.27.4/cap
    gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
  
    g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
-diff -up gnome-control-center-2.27.4/capplets/appearance/Makefile.am.polkit1 gnome-control-center-2.27.4/capplets/appearance/Makefile.am
 diff -up gnome-control-center-2.27.4/configure.in.polkit1 gnome-control-center-2.27.4/configure.in
---- gnome-control-center-2.27.4/configure.in.polkit1	2009-07-15 16:52:23.635066071 -0400
-+++ gnome-control-center-2.27.4/configure.in	2009-07-15 16:52:23.673341548 -0400
-@@ -98,7 +98,6 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
- PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
- PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
- PKG_CHECK_MODULES(GIO, gio-2.0)
--PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome)
- 
- gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
- gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
-@@ -224,11 +223,6 @@ if test "x$enable_aboutme" = "xyes"; the
+--- gnome-control-center-2.27.4/configure.in.polkit1	2009-07-23 15:02:20.359485300 -0400
++++ gnome-control-center-2.27.4/configure.in	2009-07-23 15:02:28.628752812 -0400
+@@ -223,11 +223,6 @@ if test "x$enable_aboutme" = "xyes"; the
    PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
                      [AC_DEFINE([HAVE_LIBEBOOK], 1,
                      [Define if evolution-data-server libebook-1.2 is available])])
@@ -257,4 +217,4 @@ diff -up gnome-control-center-2.27.4/con
 -  		    has_polkit=false)
  fi
  
- PKG_CHECK_MODULES(GAIL, [gail])
+ AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")

More information about the fedora-extras-commits mailing list