Author: fcrozat
Date: Fri Feb 16 11:45:01 2007
New Revision: 121643
Added:
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.17.91-fixdefaultapplicationpath.patch
Modified:
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
Log:
Patch17 (SVN): fix default applications glade path location
Added:
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.17.91-fixdefaultapplicationpath.patch
==============================================================================
--- (empty file)
+++
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.17.91-fixdefaultapplicationpath.patch
Fri Feb 16 11:45:01 2007
@@ -0,0 +1,70 @@
+Index: gnome-da-xml.c
+===================================================================
+--- gnome-control-center/capplets/default-applications/gnome-da-xml.c
(r�vision 7289)
++++ gnome-control-center/capplets/default-applications/gnome-da-xml.c
(r�vision 7290)
+@@ -219,8 +219,7 @@
+ {
+ gchar *filename;
+
+- filename = g_build_filename (DATADIR,
+- "gnome-default-applications",
++ filename = g_build_filename (GNOMECC_DATA_DIR,
+ "gnome-default-applications.xml",
+ NULL);
+
+Index: ChangeLog
+===================================================================
+--- gnome-control-center/capplets/default-applications/ChangeLog
(r�vision 7289)
++++ gnome-control-center/capplets/default-applications/ChangeLog
(r�vision 7290)
+@@ -1,3 +1,11 @@
++2007-02-13 Jens Granseuer <[EMAIL PROTECTED]>
++
++ * Makefile.am:
++ * gnome-da-capplet.c: (show_dialog):
++ * gnome-da-xml.c: (gnome_da_xml_load_list): really fix DATADIR and
++ make directory definitions more consistent with other capplets.
++ Closes bug #407597.
++
+ 2007-02-03 Jens Granseuer <[EMAIL PROTECTED]>
+
+ * Makefile.am: fix DATADIR define
+Index: Makefile.am
+===================================================================
+--- gnome-control-center/capplets/default-applications/Makefile.am
(r�vision 7289)
++++ gnome-control-center/capplets/default-applications/Makefile.am
(r�vision 7290)
+@@ -19,16 +19,16 @@
+ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+
+ xmldata_in_files = gnome-default-applications.xml.in
+-xmldatadir = $(pkgdatadir)/gnome-default-applications
++xmldatadir = $(pkgdatadir)
+ xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+
+ INCLUDES = \
+ $(GNOMECC_CAPPLETS_CFLAGS) \
+ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
+- -DGLADEDIR=\""$(gladedir)"\" \
+- -DGNOMELOCALEDIR="\"$(datadir)/locale\""\
+- -DDATADIR=\""$(xmldatadir)"\"
++ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
++ -DGNOMECC_GLADE_DIR=\""$(gladedir)"\" \
++ -DGNOMECC_DATA_DIR=\""$(pkgdatadir)"\"
+
+ noinst_DATA = gnome-default-applications.xml.in
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files)
$(desktop_DATA) $(xmldata_DATA)
+Index: gnome-da-capplet.c
+===================================================================
+--- gnome-control-center/capplets/default-applications/gnome-da-capplet.c
(r�vision 7289)
++++ gnome-control-center/capplets/default-applications/gnome-da-capplet.c
(r�vision 7290)
+@@ -746,8 +746,8 @@
+ {
+ GConfValue *value;
+
+- if (g_file_test (GLADEDIR "/gnome-default-applications-properties.glade",
G_FILE_TEST_EXISTS) != FALSE) {
+- capplet->xml = glade_xml_new (GLADEDIR
"/gnome-default-applications-properties.glade", NULL, NULL);
++ if (g_file_test (GNOMECC_GLADE_DIR
"/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) {
++ capplet->xml = glade_xml_new (GNOMECC_GLADE_DIR
"/gnome-default-applications-properties.glade", NULL, NULL);
+ }
+ else {
+ capplet->xml = glade_xml_new
("./gnome-default-applications-properties.glade", NULL, NULL);
Modified:
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
==============================================================================
---
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
(original)
+++
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
Fri Feb 16 11:45:01 2007
@@ -6,7 +6,7 @@
Summary: GNOME control center
Name: gnome-%{pkgname}
Version: 2.17.91
-Release: %mkrel 1
+Release: %mkrel 2
License: GPL
Group: Graphical desktop/GNOME
BuildRequires: evolution-data-server-devel >= 1.5.3
@@ -43,6 +43,9 @@
Patch13: gnome-control-center-2.8.2-badkeysim.patch
# (fc) 2.10.2-2mdk display icons when control-center is not started from GNOME
(Mdk bug #16767)
Patch16: gnome-control-center-2.17.3-menulocation.patch
+# (fc) 2.17.91-2mdv fix default applications glade file search (SVN)
+Patch17: gnome-control-center-2.17.91-fixdefaultapplicationpath.patch
+
Requires: gstreamer0.10-plugins-base
Requires: gstreamer0.10-plugins-good
Obsoletes: %{pkgname}
@@ -104,6 +107,11 @@
%patch11 -p1 -b .multimedia
%patch13 -p1 -b .badkeysim
%patch16 -p1 -b .menulocation
+%patch17 -p1 -b .fixdefaultapplicationpath
+
+#needed by patch17
+aclocal-1.8
+automake-1.8 -a
%build
%configure2_5x --enable-aboutme --disable-scrollkeeper --enable-gstreamer=0.10
