rpms/GConf2/devel gconf-defaults.patch,1.3,1.4
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sun May 4 22:30:52 UTC 2008
- Previous message (by thread): rpms/gmime/devel .cvsignore, 1.15, 1.16 gmime.spec, 1.36, 1.37 sources, 1.15, 1.16
- Next message (by thread): rpms/shorewall/devel patch-common-4.0.10-1.diff, NONE, 1.1 patch-perl-4.0.10-1.diff, NONE, 1.1 shorewall.spec, 1.52, 1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29404
Modified Files:
gconf-defaults.patch
Log Message:
fix patch
gconf-defaults.patch:
Index: gconf-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/gconf-defaults.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gconf-defaults.patch 4 May 2008 22:19:56 -0000 1.3
+++ gconf-defaults.patch 4 May 2008 22:30:08 -0000 1.4
@@ -1,6 +1,6 @@
diff -up GConf-2.22.0/configure.in.defaults GConf-2.22.0/configure.in
--- GConf-2.22.0/configure.in.defaults 2008-03-10 10:52:28.000000000 -0400
-+++ GConf-2.22.0/configure.in 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/configure.in 2008-05-04 18:25:49.000000000 -0400
@@ -166,6 +166,7 @@ AC_SUBST(DEPENDENT_WITH_GTK_CFLAGS)
AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_LIBS)
AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_CFLAGS)
@@ -19,7 +19,7 @@
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.c
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults.c 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults.c 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,704 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -727,7 +727,7 @@
+}
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.h
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults.h 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults.h 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -815,7 +815,7 @@
+#endif /* GCONF_DEFAULTS_H */
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults-main.c
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults-main.c 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults-main.c 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,174 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -993,7 +993,7 @@
+}
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.xml
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults.xml 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults.xml 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,61 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/">
@@ -1058,7 +1058,7 @@
+</node>
diff -up /dev/null GConf-2.22.0/defaults/Makefile.am
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/Makefile.am 2008-05-04 18:18:04.000000000 -0400
++++ GConf-2.22.0/defaults/Makefile.am 2008-05-04 18:28:36.000000000 -0400
@@ -0,0 +1,56 @@
+libexec_PROGRAMS = gconf-defaults-mechanism
+
@@ -1080,7 +1080,7 @@
+ $(DEFAULTS_CFLAGS)
+
+gconf_defaults_mechanism_LDADD = \
-+ $(top_builddir}/gconf/libgconf-2.la \
++ $(top_builddir)/gconf/libgconf-2.la \
+ $(DEFAULTS_LIBS)
+
+BUILT_SOURCES = gconf-defaults-glue.h
@@ -1118,7 +1118,7 @@
+
diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
@@ -1145,7 +1145,7 @@
+</busconfig>
diff -up /dev/null GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
@@ -1177,7 +1177,7 @@
+</policyconfig>
diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in 2008-05-04 18:25:49.000000000 -0400
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.GConf.Defaults
@@ -1185,7 +1185,7 @@
+User=root
diff -up GConf-2.22.0/Makefile.am.defaults GConf-2.22.0/Makefile.am
--- GConf-2.22.0/Makefile.am.defaults 2007-06-25 07:11:31.000000000 -0400
-+++ GConf-2.22.0/Makefile.am 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/Makefile.am 2008-05-04 18:25:49.000000000 -0400
@@ -1,5 +1,5 @@
-SUBDIRS = gconf backends po doc examples
@@ -1195,7 +1195,7 @@
EXTRA_DIST = \
diff -up GConf-2.22.0/po/POTFILES.in.defaults GConf-2.22.0/po/POTFILES.in
--- GConf-2.22.0/po/POTFILES.in.defaults 2007-06-25 07:11:31.000000000 -0400
-+++ GConf-2.22.0/po/POTFILES.in 2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/po/POTFILES.in 2008-05-04 18:25:49.000000000 -0400
@@ -9,6 +9,7 @@ backends/xml-backend.c
backends/xml-cache.c
backends/xml-dir.c
- Previous message (by thread): rpms/gmime/devel .cvsignore, 1.15, 1.16 gmime.spec, 1.36, 1.37 sources, 1.15, 1.16
- Next message (by thread): rpms/shorewall/devel patch-common-4.0.10-1.diff, NONE, 1.1 patch-perl-4.0.10-1.diff, NONE, 1.1 shorewall.spec, 1.52, 1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list