OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Mar-2007 09:46:21
Branch: HEAD Handle: 2007030608462100
Modified files:
openpkg-src/gconf gconf.patch gconf.spec
Log:
upgrading package: gconf 2.16.1 -> 2.18.0.1
Summary:
Revision Changes Path
1.5 +54 -69 openpkg-src/gconf/gconf.patch
1.28 +4 -3 openpkg-src/gconf/gconf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 gconf.patch
--- openpkg-src/gconf/gconf.patch 27 Feb 2007 07:29:52 -0000 1.4
+++ openpkg-src/gconf/gconf.patch 6 Mar 2007 08:46:21 -0000 1.5
@@ -1,25 +1,23 @@
Index: backends/Makefile.in
---- backends/Makefile.in.orig 2006-10-05 14:48:26.000000000 +0200
-+++ backends/Makefile.in 2006-10-24 17:31:57.470159499 +0200
-@@ -241,7 +241,7 @@
+--- backends/Makefile.in.orig 2007-03-05 17:27:24 +0100
++++ backends/Makefile.in 2007-03-06 09:36:04 +0100
+@@ -321,23 +321,23 @@
+ xml-entry.c \
xml-backend.c
-
-libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
+-libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module
- libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
-
++libgconfbackend_oldxml_la_LIBADD =
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_WITH_XML_LIBS)
$(INTLLIBS)
libgconfbackend_xml_la_SOURCES = \
-@@ -250,24 +250,24 @@
+ markup-backend.c \
+ markup-tree.h \
markup-tree.c
-
-libgconfbackend_xml_la_LDFLAGS = -avoid-version -module -no-undefined
+-libgconfbackend_xml_la_LIBADD = $(DEPENDENT_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_xml_la_LDFLAGS = -avoid-version -module
- libgconfbackend_xml_la_LIBADD = $(DEPENDENT_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
-
- noinst_PROGRAMS = xml-test
-
++libgconfbackend_xml_la_LIBADD =
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS) $(INTLLIBS)
xml_test_SOURCES = xml-test.c
xml_test_LDADD = \
- $(DEPENDENT_WITH_XML_LIBS) \
@@ -28,87 +26,74 @@
+ libgconfbackend-oldxml.la \
+ $(DEPENDENT_WITH_XML_LIBS)
-
- bin_PROGRAMS = gconf-merge-tree
gconf_merge_tree_SOURCES = gconf-merge-tree.c
-gconf_merge_tree_LDADD = $(DEPENDENT_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
-+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
$(DEPENDENT_LIBS)
-
++gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
$(DEPENDENT_LIBS)
@[EMAIL PROTECTED] = evoldap-backend.c
[EMAIL PROTECTED]@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
-no-undefined
[EMAIL PROTECTED]@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
+ @[EMAIL PROTECTED] = -avoid-version -module -no-undefined
@[EMAIL PROTECTED] = \
- @LDAP_SUPPORT_TRUE@ $(DEPENDENT_WITH_XML_LIBS) \
- @LDAP_SUPPORT_TRUE@ $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
-@@ -319,13 +319,13 @@
- gconf_merge_tree_OBJECTS = $(am_gconf_merge_tree_OBJECTS)
- gconf_merge_tree_DEPENDENCIES = \
- $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
--gconf_merge_tree_LDFLAGS =
-+gconf_merge_tree_LDFLAGS = -static
- am_xml_test_OBJECTS = xml-test.$(OBJEXT)
- xml_test_OBJECTS = $(am_xml_test_OBJECTS)
- xml_test_DEPENDENCIES = \
- $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
- libgconfbackend-oldxml.la
--xml_test_LDFLAGS =
-+xml_test_LDFLAGS = -static
+@@ -458,10 +458,10 @@
+ done
+ gconf-merge-tree$(EXEEXT): $(gconf_merge_tree_OBJECTS)
$(gconf_merge_tree_DEPENDENCIES)
+ @rm -f gconf-merge-tree$(EXEEXT)
+- $(LINK) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
++ $(LINK) -static $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD)
$(LIBS)
+ xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES)
+ @rm -f xml-test$(EXEEXT)
+- $(LINK) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
++ $(LINK) -static $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
Index: gconf/Makefile.in
---- gconf/Makefile.in.orig 2006-10-05 14:54:51.000000000 +0200
-+++ gconf/Makefile.in 2006-10-24 17:31:41.092121605 +0200
-@@ -291,7 +291,7 @@
+--- gconf/Makefile.in.orig 2007-03-05 17:27:25 +0100
++++ gconf/Makefile.in 2007-03-06 09:31:42 +0100
+@@ -348,7 +348,7 @@
+ gconfd.h \
gconfd.c
-
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS)
libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS)
$(DEPENDENT_LIBS)
-
# gconf_testclient_SOURCES = \
-@@ -302,13 +302,13 @@
+ # testclient.c
+@@ -357,11 +357,11 @@
+ gconftool_2_SOURCES = \
gconftool.c
-
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS)
libgconf-$(MAJOR_VERSION).la
-+gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS)
$(DEPENDENT_WITH_XML_LIBS)
-
++gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS)
$(DEPENDENT_WITH_XML_LIBS)
gconf_sanity_check_2_SOURCES = \
gconf-sanity-check.c
-
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS)
$(DEPENDENT_WITH_XML_AND_GTK_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE)
$(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS)
-
@[EMAIL PROTECTED] = dllmain.c
-
-@@ -332,7 +332,7 @@
+ libgconf_2_la_SOURCES = \
+ gconf-internals.c \
+@@ -382,7 +382,7 @@
+ $(CORBA_SOURCECODE) \
$(WIN32_SOURCECODE)
-
-libgconf_2_la_LDFLAGS = -version-info
$(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
+libgconf_2_la_LDFLAGS = -version-info
$(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
-
libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
+ EXTRA_DIST = GConfX.idl default.path.in gconfmarshal.list
regenerate-enum-header.sh regenerate-enum-footer.sh
+ all: $(BUILT_SOURCES)
+@@ -506,13 +506,13 @@
+ done
+ gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS)
$(gconf_sanity_check_2_DEPENDENCIES)
+ @rm -f gconf-sanity-check-2$(EXEEXT)
+- $(LINK) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD)
$(LIBS)
++ $(LINK) -static $(gconf_sanity_check_2_OBJECTS)
$(gconf_sanity_check_2_LDADD) $(LIBS)
+ gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES)
+ @rm -f gconfd-2$(EXEEXT)
+- $(LINK) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
++ $(LINK) -static $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
+ gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES)
+ @rm -f gconftool-2$(EXEEXT)
+- $(LINK) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
++ $(LINK) -static $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
-@@ -368,15 +368,15 @@
- am_gconf_sanity_check_2_OBJECTS = gconf-sanity-check.$(OBJEXT)
- gconf_sanity_check_2_OBJECTS = $(am_gconf_sanity_check_2_OBJECTS)
- gconf_sanity_check_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
--gconf_sanity_check_2_LDFLAGS =
-+gconf_sanity_check_2_LDFLAGS = -static
- am_gconfd_2_OBJECTS = gconf-database.$(OBJEXT) gconfd.$(OBJEXT)
- gconfd_2_OBJECTS = $(am_gconfd_2_OBJECTS)
- gconfd_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
--gconfd_2_LDFLAGS =
-+gconfd_2_LDFLAGS = -static
- am_gconftool_2_OBJECTS = gconftool.$(OBJEXT)
- gconftool_2_OBJECTS = $(am_gconftool_2_OBJECTS)
- gconftool_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
--gconftool_2_LDFLAGS =
-+gconftool_2_LDFLAGS = -static
-
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 gconf.spec
--- openpkg-src/gconf/gconf.spec 27 Feb 2007 07:29:52 -0000 1.27
+++ openpkg-src/gconf/gconf.spec 6 Mar 2007 08:46:21 -0000 1.28
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 2.16
-%define V_minor 1
+%define V_major 2.18
+%define V_minor 0.1
# package information
Name: gconf
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20070227
+Release: 20070306
# list of sources
Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/GConf/%{V_major}/GConf-%{version}.tar.bz2
@@ -79,6 +79,7 @@
LIBS="-lintl" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--disable-gtk \
--enable-shared
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
