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: 27-Feb-2007 08:29:52
Branch: HEAD Handle: 2007022707295200
Modified files:
openpkg-src/gconf gconf.patch gconf.spec
Log:
upgrading package: gconf 2.16.0 -> 2.16.1
Summary:
Revision Changes Path
1.4 +36 -6 openpkg-src/gconf/gconf.patch
1.27 +2 -2 openpkg-src/gconf/gconf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 gconf.patch
--- openpkg-src/gconf/gconf.patch 5 Oct 2006 20:12:10 -0000 1.3
+++ openpkg-src/gconf/gconf.patch 27 Feb 2007 07:29:52 -0000 1.4
@@ -1,7 +1,24 @@
Index: backends/Makefile.in
---- backends/Makefile.in.orig 2006-10-05 14:48:26 +0200
-+++ backends/Makefile.in 2006-10-05 22:10:03 +0200
-@@ -257,14 +257,14 @@
+--- 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 @@
+ xml-backend.c
+
+
+-libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
++libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module
+ libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+
+ libgconfbackend_xml_la_SOURCES = \
+@@ -250,24 +250,24 @@
+ markup-tree.c
+
+
+-libgconfbackend_xml_la_LDFLAGS = -avoid-version -module -no-undefined
++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
xml_test_SOURCES = xml-test.c
xml_test_LDADD = \
@@ -18,7 +35,11 @@
+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
$(DEPENDENT_LIBS)
@[EMAIL PROTECTED] = evoldap-backend.c
- @[EMAIL PROTECTED] = -avoid-version -module -no-undefined
[EMAIL PROTECTED]@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
-no-undefined
[EMAIL PROTECTED]@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
+ @[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 = \
@@ -36,8 +57,8 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
Index: gconf/Makefile.in
---- gconf/Makefile.in.orig 2006-10-05 14:54:51 +0200
-+++ gconf/Makefile.in 2006-10-05 22:07:26 +0200
+--- 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 @@
gconfd.c
@@ -63,6 +84,15 @@
@[EMAIL PROTECTED] = dllmain.c
+@@ -332,7 +332,7 @@
+ $(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)
+
@@ -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)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 gconf.spec
--- openpkg-src/gconf/gconf.spec 1 Jan 2007 17:38:01 -0000 1.26
+++ openpkg-src/gconf/gconf.spec 27 Feb 2007 07:29:52 -0000 1.27
@@ -24,7 +24,7 @@
# package version
%define V_major 2.16
-%define V_minor 0
+%define V_minor 1
# package information
Name: gconf
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20061024
+Release: 20070227
# list of sources
Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/GConf/%{V_major}/GConf-%{version}.tar.bz2
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
