packages: gnome-control-center/gnome-control-center.spec, gnome-control-cen...

[sls]

Author: sls                          Date: Fri Nov  6 18:16:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added no_update_desktop.patch
- rm BR: desktop-file-utils

---- Files affected:
packages/gnome-control-center:
   gnome-control-center.spec (1.29 -> 1.30) , no_update_desktop.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-control-center/gnome-control-center.spec
diff -u packages/gnome-control-center/gnome-control-center.spec:1.29 packages/gnome-control-center/gnome-control-center.spec:1.30
--- packages/gnome-control-center/gnome-control-center.spec:1.29	Fri Nov  6 16:43:20 2009
+++ packages/gnome-control-center/gnome-control-center.spec	Fri Nov  6 19:16:24 2009
@@ -13,13 +13,13 @@
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.28/%{name}-%{version}.tar.bz2
 # Source0-md5:	c0e009ed5d94d12a183b61136dd908de
+Patch0:		no_update_desktop.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	PolicyKit-gnome-devel
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.74
-BuildRequires:	desktop-file-utils
 BuildRequires:	evolution-data-server-devel >= 2.24.0
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.19.7
@@ -147,6 +147,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -161,6 +162,7 @@
 %configure \
 	--disable-schemas-install \
 	--disable-update-mimedb \
+	--disable-update-desktop \
 	--enable-aboutme \
 	X_EXTRA_LIBS="-lXext"
 %{__make}
@@ -260,8 +262,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.29  2009/11/06 15:43:20  sls
-- BR: desktop-file-utils
+Revision 1.30  2009/11/06 18:16:24  sls
+- added no_update_desktop.patch
+- rm BR: desktop-file-utils
 
 Revision 1.28  2009/11/06 15:40:44  sls
 - BR: libunique-devel >= 1.0.0

================================================================
Index: packages/gnome-control-center/no_update_desktop.patch
diff -u /dev/null packages/gnome-control-center/no_update_desktop.patch:1.1
--- /dev/null	Fri Nov  6 19:16:29 2009
+++ packages/gnome-control-center/no_update_desktop.patch	Fri Nov  6 19:16:24 2009
@@ -0,0 +1,53 @@
+diff -aurN gnome-control-center-2.28.0.orig/configure.in gnome-control-center-2.28.0/configure.in
+--- gnome-control-center-2.28.0.orig/configure.in	2009-09-24 11:34:15.000000000 +0200
++++ gnome-control-center-2.28.0/configure.in	2009-09-24 11:38:03.000000000 +0200
+@@ -298,6 +298,17 @@
+                    enable_update_mimedb=yes)
+ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+ 
++dnl =======================================
++dnl Update Desktop Database
++dnl =======================================
++
++AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
++
++AC_ARG_ENABLE(update-desktop,
++   AC_HELP_STRING([--disable-update-desktop],
++                   [do not update desktop database after installation]),,
++                   enable_update_desktop=yes)
++AM_CONDITIONAL(ENABLE_UPDATE_DESKTOP, test x$enable_update_desktop = xyes)
+ 
+ AC_CONFIG_FILES([
+ Makefile
+diff -aurN gnome-control-center-2.28.0.orig/font-viewer/Makefile.am gnome-control-center-2.28.0/font-viewer/Makefile.am
+--- gnome-control-center-2.28.0.orig/font-viewer/Makefile.am	2009-09-24 11:34:15.000000000 +0200
++++ gnome-control-center-2.28.0/font-viewer/Makefile.am	2009-09-24 11:41:45.000000000 +0200
+@@ -28,11 +28,15 @@
+ install-gconf-schemas:
+ endif
+ 
++if ENABLE_UPDATE_DESKTOP
+ install-desktop-database: install-desktopDATA
+-	update-desktop-database $(DESTDIR)$(desktopdir)
++	$(UPDATE_DESKTOP_DATABASE) $(DESTDIR)$(desktopdir)
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache
++else
++install-desktop-database:
++endif
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ @INTLTOOL_DIRECTORY_RULE@
+diff -aurN gnome-control-center-2.28.0.orig/Makefile.am gnome-control-center-2.28.0/Makefile.am
+--- gnome-control-center-2.28.0.orig/Makefile.am	2009-09-24 11:34:15.000000000 +0200
++++ gnome-control-center-2.28.0/Makefile.am	2009-09-24 11:36:11.000000000 +0200
+@@ -46,7 +46,7 @@
+ 	MAINTAINERS \
+ 	gnome-doc-utils.make
+ 
+-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb
++DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --disable-update-desktop
+ 
+ GITIGNOREFILES=m4
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-control-center/gnome-control-center.spec?r1=1.29&r2=1.30&f=u