---- GConf-1.1.8/backends/Makefile.am~ Wed Feb 20 21:05:23 2002
-+++ GConf-1.1.8/backends/Makefile.am Wed Feb 20 21:05:23 2002
+diff -Nur GConf-1.2.1/backends/Makefile.am GConf-1.2.1.new/backends/Makefile.am
+--- GConf-1.2.1/backends/Makefile.am Wed Jun 12 22:32:12 2002
++++ GConf-1.2.1.new/backends/Makefile.am Thu Aug 15 02:19:08 2002
@@ -4,7 +4,7 @@
EXTRA_DIST=README.bdb
if BDB
BDBBACKEND=libgconfbackend-bdb.la
---- GConf-1.1.8/gconf/Makefile.am~ Wed Feb 20 21:19:39 2002
-+++ GConf-1.1.8/gconf/Makefile.am Wed Feb 20 21:19:39 2002
-@@ -9,11 +9,11 @@
+diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
+--- GConf-1.2.1/gconf/Makefile.am Tue Jul 23 19:14:07 2002
++++ GConf-1.2.1.new/gconf/Makefile.am Thu Aug 15 02:21:59 2002
+@@ -9,12 +9,12 @@
-DG_LOG_DOMAIN=\"GConf\" \
-DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" \
-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
- -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \
-+ -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/"\" \
++ -DGCONF_CONFDIR=\""$(sysconfdir)/gconf"\" \
-DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \
-DGCONF_BINDIR=\""$(bindir)"\" \
+ -DGCONF_SERVERDIR=\""$(libexecdir)"\" \
-DGCONF_BUILDDIR=\""$(top_builddir)"\" \
- -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \
-+ -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\" \
++ -DGCONF_BACKEND_DIR=\""$(pkglibdir)"\" \
-DVERSION=\""$(VERSION)"\" \
-DGCONF_ENABLE_INTERNALS=1 \
-DGCONFD=\""$(GCONFD_BINARY_NAME)"\" \
-@@ -61,7 +61,7 @@
+@@ -63,7 +63,7 @@
gconf-engine.h \
gconf-client.h
gconfinclude_HEADERS = \
$(gconf_headers) \
gconf-enum-types.h
-@@ -120,8 +120,8 @@
+@@ -122,8 +122,8 @@
EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
install-data-local:
- -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
- $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path
-+ -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/
++ -mkdir -p $(DESTDIR)$(sysconfdir)/gconf
+ $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/path
gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
@true
---- GConf-1.1.8/gconf-2.0.pc.in~ Wed Feb 20 21:43:34 2002
-+++ GConf-1.1.8/gconf-2.0.pc.in Wed Feb 20 21:43:34 2002
-@@ -9,4 +9,4 @@
+diff -Nur GConf-1.2.1/gconf-2.0.pc.in GConf-1.2.1.new/gconf-2.0.pc.in
+--- GConf-1.2.1/gconf-2.0.pc.in Tue Jul 23 19:14:07 2002
++++ GConf-1.2.1.new/gconf-2.0.pc.in Thu Aug 15 02:19:08 2002
+@@ -10,4 +10,4 @@
Version: @VERSION@
Requires: ORBit-2.0
Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
Summary(pl): System konfiguracyjnej bazy danych dla GNOME2
Summary(pt_BR): Sistema de ConfiguraĆ§Ć£o do GNOME2
Name: GConf2
-Version: 1.2.0
-Release: 2
+Version: 1.2.1
+Release: 1
License: LGPL
Group: X11/Applications
Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/GConf/GConf-%{version}.tar.bz2
Patch1: %{name}-am.patch
URL: http://www.gnome.org/
BuildRequires: ORBit2-devel
-BuildRequires: bonobo-activation-devel >= 1.0.0
+BuildRequires: bonobo-activation-devel >= 1.0.3
#BuildRequires: db3-devel
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.0.1
-BuildRequires: glib2-devel >= 2.0.1
+BuildRequires: gtk+2-devel >= 2.0.6
+BuildRequires: glib2-devel >= 2.0.6
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
BuildRequires: popt-devel