rpms/control-center/devel gcc-fingerprint-selection-warning.patch, NONE, 1.1 gcc-new-fingerprint-icons.patch, NONE, 1.1 control-center.spec, 1.438, 1.439 gnome-control-center-2.25.2-gecos.patch, 1.3, 1.4

Bastien Nocera hadess at fedoraproject.org
Wed Mar 11 17:33:21 UTC 2009


Author: hadess

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

Modified Files:
	control-center.spec gnome-control-center-2.25.2-gecos.patch 
Added Files:
	gcc-fingerprint-selection-warning.patch 
	gcc-new-fingerprint-icons.patch 
Log Message:
* Wed Mar 11 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.92-2
- New icons for the fingerprint enrollment, from Mike Langlie


gcc-fingerprint-selection-warning.patch:

--- NEW FILE gcc-fingerprint-selection-warning.patch ---
Index: capplets/about-me/gnome-about-me-fingerprint.c
===================================================================
--- capplets/about-me/gnome-about-me-fingerprint.c	(revision 9336)
+++ capplets/about-me/gnome-about-me-fingerprint.c	(working copy)
@@ -310,7 +342,7 @@
 static void
 finger_combobox_changed (GtkComboBox *combobox, EnrollData *data)
 {
-	data->finger = selected_finger (data->dialog_page2);
+	data->finger = selected_finger (data->dialog_page1);
 }
 
 static void

gcc-new-fingerprint-icons.patch:

--- NEW FILE gcc-new-fingerprint-icons.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 9336)
+++ configure.in	(working copy)
@@ -284,6 +284,7 @@
 capplets/Makefile
 capplets/about-me/Makefile
 capplets/about-me/gnome-about-me.desktop.in
+capplets/about-me/icons/Makefile
 capplets/accessibility/Makefile
 capplets/accessibility/at-properties/at-properties.desktop.in
 capplets/accessibility/at-properties/Makefile
Index: capplets/about-me/gnome-about-me-fingerprint.c
===================================================================
--- capplets/about-me/gnome-about-me-fingerprint.c	(revision 9336)
+++ capplets/about-me/gnome-about-me-fingerprint.c	(working copy)
@@ -332,12 +364,14 @@
 	char *msg;
 
 	if (g_str_equal (result, "enroll-completed") || g_str_equal (result, "enroll-stage-passed")) {
-		char *name;
+		char *name, *path;
 
 		data->num_stages_done++;
 		name = g_strdup_printf ("image%d", data->num_stages_done);
-		gtk_image_set_from_stock (GTK_IMAGE (WID (name)), GTK_STOCK_YES, GTK_ICON_SIZE_DIALOG);
+		path = g_build_filename (GNOMECC_PIXMAP_DIR, "print_ok.svg", NULL);
+		gtk_image_set_from_file (GTK_IMAGE (WID (name)), path);
 		g_free (name);
+		g_free (path);
 	}
 	if (g_str_equal (result, "enroll-completed")) {
 		gtk_label_set_text (GTK_LABEL (WID ("status-label")), _("Done!"));
@@ -375,6 +409,7 @@
 		DBusGProxy *p;
 		GError *error = NULL;
 		GladeXML *dialog = data->dialog_page2;
+		char *path;
 		guint i;
 		GValue value = { 0, };
 
@@ -430,7 +465,22 @@
 			gtk_widget_hide (WID (name));
 			g_free (name);
 		}
+		/* And set the right image */
+		{
+			char *filename;
 
+			filename = g_strdup_printf ("%s.svg", data->finger);
+			path = g_build_filename (GNOMECC_PIXMAP_DIR, filename, NULL);
+			g_free (filename);
+		}
+		for (i = 1; i <= data->num_enroll_stages; i++) {
+			char *name;
+			name = g_strdup_printf ("image%d", i);
+			gtk_image_set_from_file (GTK_IMAGE (WID (name)), path);
+			g_free (name);
+		}
+		g_free (path);
+
 		dbus_g_proxy_add_signal(data->device, "EnrollStatus", G_TYPE_STRING, G_TYPE_BOOLEAN, NULL);
 		dbus_g_proxy_connect_signal(data->device, "EnrollStatus", G_CALLBACK(enroll_result), data, NULL);
 
Index: capplets/about-me/Makefile.am
===================================================================
--- capplets/about-me/Makefile.am	(revision 9336)
+++ capplets/about-me/Makefile.am	(working copy)
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 # This is used in GNOMECC_CAPPLETS_CFLAGS
 cappletname = about-me
 
@@ -4,10 +6,6 @@
 glade_files = gnome-about-me.glade gnome-about-me-fingerprint.glade
 Desktop_in_files = gnome-about-me.desktop.in
 
-pixmap_files = 				\
-	gnome-about-me-lock.png		\
-	gnome-about-me-lock-open.png
-
 gnome_about_me_SOURCES =	 	\
 	eel-alert-dialog.c		\
 	eel-alert-dialog.h		\
@@ -25,9 +23,6 @@
 if BUILD_ABOUTME
 bin_PROGRAMS = gnome-about-me
 
-pixmapdir = $(pkgdatadir)/pixmaps
-pixmap_DATA = $(pixmap_files)
-
 gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
 gnome_about_me_LDFLAGS = -export-dynamic
 
@@ -46,7 +41,7 @@
 	-DDATADIR="\"$(datadir)\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-	-DGNOMECC_PIXMAP_DIR="\"$(pixmapdir)\"" \
+	-DGNOMECC_PIXMAP_DIR="\"$(pkgdatadir)/pixmaps\"" \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 
 MARSHALFILES = marshal.c marshal.h
@@ -61,4 +56,4 @@
 endif # BUILD_ABOUTME
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES)
-EXTRA_DIST = $(glade_files) $(pixmap_files) fprintd-marshal.list
+EXTRA_DIST = $(glade_files) fprintd-marshal.list
Index: capplets/about-me/icons/right-middle-finger.svg
===================================================================
--- capplets/about-me/icons/right-middle-finger.svg	(revision 0)
+++ capplets/about-me/icons/right-middle-finger.svg	(revision 0)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 40.425 46.214"
+   enable-background="new 0 0 40.425 46.214"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="right-middle-finger.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/mlanglie/Desktop/Fingerprint Enrollment Icons/Vector/left-index-finger.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata44"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs42"><inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 23.107 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="40.424999 : 23.107 : 1"
+   inkscape:persp3d-origin="20.2125 : 15.404667 : 1"
+   id="perspective46" />
+	
+	
+	
+	
+	
+	
+<radialGradient
+   r="8.341651"
+   fy="9.3411446"
+   fx="38.658855"
+   cy="9.3411446"
+   cx="38.658855"
+   gradientUnits="userSpaceOnUse"
+   id="radialGradient2479"
+   xlink:href="#linearGradient2378"
+   inkscape:collect="always" /><linearGradient
+   id="linearGradient2378"><stop
+     id="stop2386"
+     offset="0"
+     style="stop-color:#ffffff;stop-opacity:1;" /><stop
+     style="stop-color:#27dc16;stop-opacity:1;"
+     offset="1"
+     id="stop2382" /></linearGradient><linearGradient
+   id="linearGradient3702"><stop
+     id="stop3704"
+     offset="0"
+     style="stop-color:black;stop-opacity:0;" /><stop
+     style="stop-color:black;stop-opacity:1;"
+     offset="0.5"
+     id="stop3710" /><stop
+     id="stop3706"
+     offset="1"
+     style="stop-color:black;stop-opacity:0;" /></linearGradient><linearGradient
+   id="linearGradient6732"><stop
+     id="stop6734"
+     offset="0"
+     style="stop-color:#ffffff;stop-opacity:1;" /><stop
+     id="stop6736"
+     offset="1"
+     style="stop-color:#dddddd;stop-opacity:1;" /></linearGradient><linearGradient
+   id="linearGradient4585"><stop
+     id="stop4587"
+     offset="0"
+     style="stop-color:#9e9e9e;stop-opacity:1;" /><stop
+     id="stop4589"
+     offset="1"
+     style="stop-color:#dddddd;stop-opacity:0;" /></linearGradient><inkscape:perspective
[...2466 lines suppressed...]
+	right-index-finger.png		\
+	right-little-finger.png		\
+	right-middle-finger.png		\
+	right-ring-finger.png		\
+	right-thumb.png			\
+	print_error.png			\
+	print_ok.png
+
+pixmapdir = $(pkgdatadir)/pixmaps
+pixmap_DATA = $(pixmap_files) $(finger_svg_files)
+
+EXTRA_DIST = $(pixmap_files) $(finger_png_files) $(finger_svg_files)
Index: capplets/about-me/icons/right-little-finger.svg
===================================================================
--- capplets/about-me/icons/right-little-finger.svg	(revision 0)
+++ capplets/about-me/icons/right-little-finger.svg	(revision 0)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 40.425 46.214"
+   enable-background="new 0 0 40.425 46.214"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="right-pinky-finger.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/mlanglie/Desktop/Fingerprint Enrollment Icons/Vector/left-ring-finger.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata44"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs42"><inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 23.107 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="40.424999 : 23.107 : 1"
+   inkscape:persp3d-origin="20.2125 : 15.404667 : 1"
+   id="perspective46" />
+	
+	
+	
+	
+	
+	
+<radialGradient
+   r="8.341651"
+   fy="9.3411446"
+   fx="38.658855"
+   cy="9.3411446"
+   cx="38.658855"
+   gradientUnits="userSpaceOnUse"
+   id="radialGradient2479"
+   xlink:href="#linearGradient2378"
+   inkscape:collect="always" /><linearGradient
+   id="linearGradient2378"><stop
+     id="stop2386"
+     offset="0"
+     style="stop-color:#ffffff;stop-opacity:1;" /><stop
+     style="stop-color:#27dc16;stop-opacity:1;"
+     offset="1"
+     id="stop2382" /></linearGradient><linearGradient
+   id="linearGradient3702"><stop
+     id="stop3704"
+     offset="0"
+     style="stop-color:black;stop-opacity:0;" /><stop
+     style="stop-color:black;stop-opacity:1;"
+     offset="0.5"
+     id="stop3710" /><stop
+     id="stop3706"
+     offset="1"
+     style="stop-color:black;stop-opacity:0;" /></linearGradient><linearGradient
+   id="linearGradient6732"><stop
+     id="stop6734"
+     offset="0"
+     style="stop-color:#ffffff;stop-opacity:1;" /><stop
+     id="stop6736"
+     offset="1"
+     style="stop-color:#dddddd;stop-opacity:1;" /></linearGradient><linearGradient
+   id="linearGradient4585"><stop
+     id="stop4587"
+     offset="0"
+     style="stop-color:#9e9e9e;stop-opacity:1;" /><stop
+     id="stop4589"
+     offset="1"
+     style="stop-color:#dddddd;stop-opacity:0;" /></linearGradient><inkscape:perspective
+   id="perspective2516"
+   inkscape:persp3d-origin="24 : 16 : 1"
+   inkscape:vp_z="48 : 24 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_x="0 : 24 : 1"
+   sodipodi:type="inkscape:persp3d" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2378"
+   id="radialGradient86956"
+   cx="26.49"
+   cy="5.5700002"
+   fx="26.49"
+   fy="5.5700002"
+   r="4.0552225"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(1.0059869,5.3782029e-7,-9.45767e-7,1.1767077,-0.1585918,-0.9842761)" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2378"
+   id="radialGradient86964"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(1.0059869,5.3782029e-7,-9.45767e-7,1.1767077,-0.1585918,-0.9842761)"
+   cx="26.49"
+   cy="5.5700002"
+   fx="26.49"
+   fy="5.5700002"
+   r="4.0552225" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2378"
+   id="radialGradient86966"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(1.0059869,5.3782029e-7,-9.45767e-7,1.1767077,-0.1585918,-0.9842761)"
+   cx="26.49"
+   cy="5.5700002"
+   fx="26.49"
+   fy="5.5700002"
+   r="4.0552225" /></defs><sodipodi:namedview
+   inkscape:window-height="933"
+   inkscape:window-width="1054"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="11.122171"
+   inkscape:cx="22.316511"
+   inkscape:cy="30.299841"
+   inkscape:window-x="346"
+   inkscape:window-y="109"
+   inkscape:current-layer="svg2" />
+<g
+   id="g35"
+   style="fill:url(#radialGradient86956);fill-opacity:1;stroke:#31ae00;stroke-width:0.45244551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(-1.1074589,0,0,1.2726911,65.968411,5.5330271)">
+		<circle
+   style="fill:url(#radialGradient86964);fill-opacity:1;stroke:#31ae00;stroke-width:0.45244551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   sodipodi:ry="3.829"
+   sodipodi:rx="3.829"
+   sodipodi:cy="5.5700002"
+   sodipodi:cx="26.49"
+   id="circle37"
+   r="3.829"
+   cy="5.5700002"
+   cx="26.49"
+   stroke-miterlimit="3.8637" />
+		<path
+   style="fill:url(#radialGradient86966);fill-opacity:1;stroke:#31ae00;stroke-width:0.45244551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="path39"
+   stroke-miterlimit="3.8637"
+   d="" />
+	</g><g
+   id="Background"
+   transform="matrix(-1,0,0,1,40.436756,0)">
+</g>
+<g
+   id="Guides"
+   display="none"
+   style="display:none">
+</g>
+<g
+   id="g7"
+   style="fill:#2f2f2f;fill-opacity:1"
+   transform="matrix(-1,0,0,1,40.436756,0)">
+		<path
+   style="fill:#2f2f2f;fill-opacity:1;fill-rule:evenodd"
+   id="path9"
+   d="M 20.569,13.286 C 20.843,15.459 20.791,17.834 20.82,18.542 C 20.865,18.917 21.913,19.241 22.094,18.877 C 22.301,17.514 22.586,14.847 22.92,13.455 C 23.372,9.917 23.886,8.247 24.072,7.257 C 24.58,4.567 25.014,3.12 26.762,3.12 C 28.384,3.12 28.623,5.167 28.153,8.165 C 28.025,9.379 28.036,12.24 27.433,14.894 C 27.165,16.691 26.962,21.278 27.139,24.981 C 27.189,26.045 27.669,27.315 28.242,27.945 C 29.462,27.773 30.379,24.377 31.988,22.847 C 32.809,21.464 34.883,19.299 36.951,19.299 C 39.243,19.299 39.292,21 38.345,22.262 C 37.187,23.806 36.525,24.528 36.079,25.802 C 35.633,27.076 33.758,29.778 33.471,31.209 C 32.902,34.054 32.471,35.105 29.284,37.661 C 27.783,38.865 27.302,39.637 26.855,40.401 C 26.347,41.273 26.409,44.721 26.409,46.212 L 10.64,46.212 C 10.64,46.212 10.767,43.587 10.513,42.058 C 10.461,41.746 10.105,39.613 9.176,38.231 C 8.317,36.954 5.902,32.306 5.902,26.836 C 5.902,24.026 4.39,21.718 3.854,19.533 C 3.591,17.833 2.638,15.423 2.57,14.709 C 1.684,11.559 2.1
 32,10.118 3.741,10.118 C 5.132,10.118 5.528,11.927 6.093,13.622 C 6.258,14.52 7.505,16.934 7.788,18.233 C 8.038,19.088 8.897,21.556 9.437,21.727 C 9.75,21.784 10.151,21.523 10.291,21.043 C 10.52,20.26 9.818,18.945 9.539,15.26 C 9.087,12.343 9.17,10.139 9.116,8.949 C 8.653,5.424 9.133,3.598 10.693,3.598 C 12.176,3.598 12.568,4.455 13.02,7.936 C 13.189,9.518 13.754,12.095 14.037,14.864 C 14.213,16.364 14.639,18.601 14.98,19.17 C 15.285,19.503 15.919,19.198 15.9,18.848 C 15.894,16.377 15.732,14.977 15.958,12.999 C 15.845,10.287 16.219,7.823 16.219,6.467 C 16.219,3.494 16.502,1.473 18.358,1.473 C 20.333,1.473 20.287,3.776 20.287,6.806 C 20.399,7.545 20.456,10.087 20.569,13.286 z"
+   clip-rule="evenodd" />
+	</g>
+<g
+   style="display:inline"
+   inkscape:label="Base"
+   id="layer1"
+   transform="matrix(-1,0,0,1,92.903403,2.6102791)" /></svg>
\ No newline at end of file


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- control-center.spec	3 Mar 2009 02:49:23 -0000	1.438
+++ control-center.spec	11 Mar 2009 17:32:50 -0000	1.439
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -51,6 +51,12 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=546036
 Patch33: notification-theme.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=574973
+Patch34: gcc-new-fingerprint-icons.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=574974
+Patch35: gcc-fingerprint-selection-warning.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -173,6 +179,8 @@
 %patch30 -p1 -b .default-layout-toggle
 %patch32 -p1 -b .display-no-help
 %patch33 -p1 -b .notification-theme
+%patch34 -p0 -b .new-icons
+%patch35 -p0 -b .fprint-selection-warning
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -347,6 +355,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Mar 11 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.92-2
+- New icons for the fingerprint enrollment, from Mike Langlie
+
 * Mon Mar  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.92-1
 - Update to 2.25.92
 

gnome-control-center-2.25.2-gecos.patch:

Index: gnome-control-center-2.25.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-control-center-2.25.2-gecos.patch	17 Dec 2008 02:36:38 -0000	1.3
+++ gnome-control-center-2.25.2-gecos.patch	11 Mar 2009 17:32:50 -0000	1.4
@@ -6158,7 +6158,7 @@
 --- gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos	2008-12-02 11:52:42.000000000 -0500
 +++ gnome-control-center-2.25.2/capplets/about-me/Makefile.am	2008-12-16 21:16:16.000000000 -0500
 @@ -9,13 +9,16 @@ pixmap_files = 				\
- 	gnome-about-me-lock-open.png
+ Desktop_in_files = gnome-about-me.desktop.in
  
  gnome_about_me_SOURCES =	 	\
 -	eel-alert-dialog.c		\
@@ -6178,8 +6178,8 @@
  	gnome-about-me-fingerprint.h	\
  	$(MARSHALFILES)			\
 @@ -28,7 +31,7 @@ bin_PROGRAMS = gnome-about-me
- pixmapdir = $(pkgdatadir)/pixmaps
- pixmap_DATA = $(pixmap_files)
+ if BUILD_ABOUTME
+ bin_PROGRAMS = gnome-about-me
  
 -gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
 +gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) $(GAIL_LIBS)




More information about the fedora-extras-commits mailing list