OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Sep-2007 08:30:54
Branch: HEAD Handle: 2007092107305300
Modified files:
openpkg-src/gconf gconf.patch gconf.spec
Log:
upgrading package: gconf 2.19.1 -> 2.20.0
Summary:
Revision Changes Path
1.7 +26 -23 openpkg-src/gconf/gconf.patch
1.31 +3 -3 openpkg-src/gconf/gconf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 gconf.patch
--- openpkg-src/gconf/gconf.patch 23 Jun 2007 17:54:19 -0000 1.6
+++ openpkg-src/gconf/gconf.patch 21 Sep 2007 06:30:53 -0000 1.7
@@ -1,7 +1,7 @@
Index: backends/Makefile.in
---- backends/Makefile.in.orig 2007-06-23 15:11:08 +0200
-+++ backends/Makefile.in 2007-06-23 19:49:32 +0200
-@@ -319,23 +319,23 @@
+--- backends/Makefile.in.orig 2007-09-19 16:19:59 +0200
++++ backends/Makefile.in 2007-09-21 08:17:08 +0200
+@@ -318,25 +318,25 @@
xml-entry.c \
xml-backend.c
@@ -28,27 +28,30 @@
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] = -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] = \
-@@ -456,10 +456,10 @@
+ @LDAP_SUPPORT_TRUE@ $(DEPENDENT_WITH_XML_LIBS) \
+ @LDAP_SUPPORT_TRUE@ $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+@@ -455,10 +455,10 @@
done
gconf-merge-tree$(EXEEXT): $(gconf_merge_tree_OBJECTS)
$(gconf_merge_tree_DEPENDENCIES)
@rm -f gconf-merge-tree$(EXEEXT)
-- $(LINK) $(gconf_merge_tree_LDFLAGS) $(gconf_merge_tree_OBJECTS)
$(gconf_merge_tree_LDADD) $(LIBS)
-+ $(LINK) -static $(gconf_merge_tree_LDFLAGS) $(gconf_merge_tree_OBJECTS)
$(gconf_merge_tree_LDADD) $(LIBS)
+- $(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_LDFLAGS) $(xml_test_OBJECTS) $(xml_test_LDADD)
$(LIBS)
-+ $(LINK) -static $(xml_test_LDFLAGS) $(xml_test_OBJECTS)
$(xml_test_LDADD) $(LIBS)
+- $(LINK) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
++ $(LINK) -static $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Index: gconf/Makefile.in
---- gconf/Makefile.in.orig 2007-06-23 15:11:10 +0200
-+++ gconf/Makefile.in 2007-06-23 19:50:00 +0200
-@@ -354,7 +354,7 @@
+--- gconf/Makefile.in.orig 2007-09-19 16:19:59 +0200
++++ gconf/Makefile.in 2007-09-21 08:22:18 +0200
+@@ -345,7 +345,7 @@
gconfd.h \
gconfd.c
@@ -57,12 +60,12 @@
# gconf_testclient_SOURCES = \
# testclient.c
-@@ -363,11 +363,11 @@
+@@ -354,11 +354,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
@@ -71,7 +74,7 @@
@[EMAIL PROTECTED] = dllmain.c
libgconf_2_la_SOURCES = \
gconf-internals.c \
-@@ -388,7 +388,7 @@
+@@ -379,7 +379,7 @@
$(CORBA_SOURCECODE) \
$(WIN32_SOURCECODE)
@@ -80,20 +83,20 @@
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)
-@@ -512,13 +512,13 @@
+@@ -503,13 +503,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_LDFLAGS) $(gconf_sanity_check_2_OBJECTS)
$(gconf_sanity_check_2_LDADD) $(LIBS)
-+ $(LINK) -static $(gconf_sanity_check_2_LDFLAGS)
$(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
+- $(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_LDFLAGS) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD)
$(LIBS)
-+ $(LINK) -static $(gconfd_2_LDFLAGS) $(gconfd_2_OBJECTS)
$(gconfd_2_LDADD) $(LIBS)
+- $(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_LDFLAGS) $(gconftool_2_OBJECTS)
$(gconftool_2_LDADD) $(LIBS)
-+ $(LINK) -static $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS)
$(gconftool_2_LDADD) $(LIBS)
+- $(LINK) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
++ $(LINK) -static $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 gconf.spec
--- openpkg-src/gconf/gconf.spec 20 Jul 2007 20:16:32 -0000 1.30
+++ openpkg-src/gconf/gconf.spec 21 Sep 2007 06:30:53 -0000 1.31
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 2.19
-%define V_minor 1
+%define V_major 2.20
+%define V_minor 0
# package information
Name: gconf
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20070720
+Release: 20070921
# 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]
