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: 23-Jun-2007 19:54:19
Branch: HEAD Handle: 2007062318541900
Modified files:
openpkg-src/gconf gconf.patch gconf.spec
Log:
upgrading package: gconf 2.18.0.1 -> 2.19.1
Summary:
Revision Changes Path
1.6 +20 -20 openpkg-src/gconf/gconf.patch
1.29 +3 -3 openpkg-src/gconf/gconf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 gconf.patch
--- openpkg-src/gconf/gconf.patch 6 Mar 2007 08:46:21 -0000 1.5
+++ openpkg-src/gconf/gconf.patch 23 Jun 2007 17:54:19 -0000 1.6
@@ -1,7 +1,7 @@
Index: backends/Makefile.in
---- 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 @@
+--- 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 @@
xml-entry.c \
xml-backend.c
@@ -32,23 +32,23 @@
@[EMAIL PROTECTED] = evoldap-backend.c
@[EMAIL PROTECTED] = -avoid-version -module -no-undefined
@[EMAIL PROTECTED] = \
-@@ -458,10 +458,10 @@
+@@ -456,10 +456,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)
+- $(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)
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)
+- $(LINK) $(xml_test_LDFLAGS) $(xml_test_OBJECTS) $(xml_test_LDADD)
$(LIBS)
++ $(LINK) -static $(xml_test_LDFLAGS) $(xml_test_OBJECTS)
$(xml_test_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Index: gconf/Makefile.in
---- 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 @@
+--- 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 @@
gconfd.h \
gconfd.c
@@ -57,7 +57,7 @@
# gconf_testclient_SOURCES = \
# testclient.c
-@@ -357,11 +357,11 @@
+@@ -363,11 +363,11 @@
gconftool_2_SOURCES = \
gconftool.c
@@ -71,7 +71,7 @@
@[EMAIL PROTECTED] = dllmain.c
libgconf_2_la_SOURCES = \
gconf-internals.c \
-@@ -382,7 +382,7 @@
+@@ -388,7 +388,7 @@
$(CORBA_SOURCECODE) \
$(WIN32_SOURCECODE)
@@ -80,20 +80,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)
-@@ -506,13 +506,13 @@
+@@ -512,13 +512,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)
+- $(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)
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)
+- $(LINK) $(gconfd_2_LDFLAGS) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD)
$(LIBS)
++ $(LINK) -static $(gconfd_2_LDFLAGS) $(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)
+- $(LINK) $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS)
$(gconftool_2_LDADD) $(LIBS)
++ $(LINK) -static $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS)
$(gconftool_2_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gconf/gconf.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 gconf.spec
--- openpkg-src/gconf/gconf.spec 6 Mar 2007 08:46:21 -0000 1.28
+++ openpkg-src/gconf/gconf.spec 23 Jun 2007 17:54:19 -0000 1.29
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 2.18
-%define V_minor 0.1
+%define V_major 2.19
+%define V_minor 1
# package information
Name: gconf
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20070306
+Release: 20070623
# 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]
