rpms/gnome-desktop/devel add-randr-12.patch, 1.2, 1.3 gnome-desktop.spec, 1.113, 1.114

[Soren Sandmann Pedersen (ssp)]

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22388

Modified Files:
	add-randr-12.patch gnome-desktop.spec 
Log Message:
Uncomment gnome-init

add-randr-12.patch:

Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/add-randr-12.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- add-randr-12.patch	29 Jan 2008 08:20:40 -0000	1.2
+++ add-randr-12.patch	29 Jan 2008 08:36:48 -0000	1.3
@@ -1,6 +1,24 @@
+diff -up gnome-desktop-2.21.90/configure.in.add-randr-12 gnome-desktop-2.21.90/configure.in
+--- gnome-desktop-2.21.90/configure.in.add-randr-12	2008-01-29 03:26:12.000000000 -0500
++++ gnome-desktop-2.21.90/configure.in	2008-01-29 03:26:23.000000000 -0500
+@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
+ AC_SUBST(GNOME_DISTRIBUTOR)
+ AC_SUBST(GNOME_DATE)
+ 
+-GNOME_COMMON_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
++#GNOME_COMMON_INIT
++#GNOME_DEBUG_CHECK
++#GNOME_COMPILE_WARNINGS([maximum])
++#GNOME_MAINTAINER_MODE_DEFINES
+ 
+ # As a special favour for vuntz, support --disable-deprecations
+ 
 diff -up gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am
---- gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12	2008-01-29 03:10:24.000000000 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am	2008-01-29 03:10:07.000000000 -0500
+--- gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12	2008-01-27 18:44:20.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am	2008-01-29 03:11:09.000000000 -0500
 @@ -2,4 +2,5 @@ libgnomeui_desktopdir = $(includedir)/gn
  libgnomeui_desktop_HEADERS = \
  	gnome-ditem-edit.h \
@@ -10,7 +28,7 @@
 +	randrwrap.h
 diff -up /dev/null gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h
 --- /dev/null	2008-01-26 11:28:38.229690233 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h	2008-01-29 03:08:29.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h	2008-01-29 03:11:09.000000000 -0500
 @@ -0,0 +1,94 @@
 +#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +#error  This code is not for general consumption yet.
@@ -108,7 +126,7 @@
 +#endif
 diff -up /dev/null gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c
 --- /dev/null	2008-01-26 11:28:38.229690233 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c	2008-01-29 03:08:29.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c	2008-01-29 03:11:09.000000000 -0500
 @@ -0,0 +1,967 @@
 +#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
 +
@@ -1079,7 +1097,7 @@
 +#endif
 diff -up gnome-desktop-2.21.90/libgnome-desktop/Makefile.am.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/Makefile.am
 --- gnome-desktop-2.21.90/libgnome-desktop/Makefile.am.add-randr-12	2008-01-27 18:44:20.000000000 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/Makefile.am	2008-01-29 03:08:29.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/Makefile.am	2008-01-29 03:11:09.000000000 -0500
 @@ -20,7 +20,8 @@ libgnome_desktop_2_la_SOURCES = \
  	gnome-desktop-item.c	\
  	gnome-ditem-edit.c	\


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gnome-desktop.spec	29 Jan 2008 08:20:40 -0000	1.113
+++ gnome-desktop.spec	29 Jan 2008 08:36:48 -0000	1.114
@@ -6,6 +6,7 @@
 %define libgnomecanvas_version 2.0.0
 %define startup_notification_version 0.5
 %define gnome_doc_utils_version 0.3.2
+%define gtk_doc_version 1.9
 
 %define po_package gnome-desktop-2.0
 
@@ -40,6 +41,7 @@
 BuildRequires: scrollkeeper 
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
+BuildRequires: gtk-doc >= %{gtk_doc_version}
 
 %description
 
@@ -121,6 +123,9 @@
 
 %changelog
 * Tue Jan 29 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.5-2
+- uncomment stuff from gnome-common in configure.in
+
+* Tue Jan 29 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.5-2
 - Don't buildrequire gtk-doc
 - Install randrwrap.h