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-Aug-2006 12:24:34
Branch: HEAD Handle: 2006082711243400
Modified files:
openpkg-src/gq gq.patch gq.spec
Log:
upgrading package: gq 1.0.0 -> 1.1.0
Summary:
Revision Changes Path
1.3 +194 -5 openpkg-src/gq/gq.patch
1.16 +4 -3 openpkg-src/gq/gq.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gq/gq.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 gq.patch
--- openpkg-src/gq/gq.patch 5 Apr 2006 17:25:45 -0000 1.2
+++ openpkg-src/gq/gq.patch 27 Aug 2006 10:24:34 -0000 1.3
@@ -1,7 +1,196 @@
+Index: configure
+--- configure.orig 2006-08-04 16:32:02 +0200
++++ configure 2006-08-27 12:18:46 +0200
+@@ -4279,12 +4279,10 @@
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0") 2>&5
+ ac_status=$?
+@@ -4292,7 +4290,6 @@
+ (exit $ac_status); }; then
+ pkg_cv_GQ_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0" 2>/dev/null`
+ else
+@@ -4309,12 +4306,10 @@
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0") 2>&5
+ ac_status=$?
+@@ -4322,7 +4317,6 @@
+ (exit $ac_status); }; then
+ pkg_cv_GQ_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0" 2>/dev/null`
+ else
+@@ -4345,13 +4339,11 @@
+ if test $_pkg_short_errors_supported = yes; then
+ GQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0"`
+ else
+ GQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0"`
+ fi
+@@ -4360,7 +4352,6 @@
+
+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0) were not met:
+
+@@ -4375,7 +4366,6 @@
+ " >&5
+ echo "$as_me: error: Package requirements (glib-2.0 >= 2.6
+ gtk+-2.0 >= 2.6
+- gnome-keyring-1
+ libglade-2.0
+ libxml-2.0) were not met:
+
+Index: src/gq-keyring.c
+--- src/gq-keyring.c.orig 2006-08-04 14:34:22 +0200
++++ src/gq-keyring.c 2006-08-27 12:18:46 +0200
+@@ -27,6 +27,7 @@
+ gq_keyring_attribute_list_from_server(struct ldapserver* server) {
+ GnomeKeyringAttributeList* attributes = NULL;
+
++#if 0
+ g_return_val_if_fail(GQ_IS_SERVER(server), NULL);
+
+ attributes = gnome_keyring_attribute_list_new();
+@@ -34,14 +35,18 @@
+ gnome_keyring_attribute_list_append_string(attributes, "server",
server->ldaphost);
+ gnome_keyring_attribute_list_append_uint32(attributes, "port",
server->ldapport);
+ gnome_keyring_attribute_list_append_string(attributes, "protocol",
"ldap");
++#endif
+ return attributes;
+ }
+
+ static GList*
+ gq_keyring_find_servers(struct ldapserver* server) {
++#if 0
+ GnomeKeyringAttributeList* list = NULL;
++#endif
+ GList* found = NULL;
+
++#if 0
+ list = gq_keyring_attribute_list_from_server(server);
+ // FIXME: do async
+ // FIXME: check result
+@@ -49,11 +54,13 @@
+ gnome_keyring_attribute_list_free(list);
+ list = NULL;
+
++#endif
+ return found;
+ }
+
+ void
+ gq_keyring_forget_password(struct ldapserver* server) {
++#if 0
+ GList* ret = NULL,
+ * item;
+
+@@ -72,15 +79,19 @@
+ }
+
+ g_list_free(ret);
++#endif
+ }
+
+ gchar*
+ gq_keyring_get_password(struct ldapserver* server) {
++#if 0
+ GList* found = NULL;
+ GList* item;
+ GnomeKeyringAttributeList* list = NULL;
++#endif
+ gchar* retval = NULL;
+
++#if 0
+ if(!gnome_keyring_is_available()) {
+ return NULL;
+ }
+@@ -97,11 +108,13 @@
+
+ g_list_foreach(found, (GFunc)gnome_keyring_found_free, NULL);
+ g_list_free(found);
++#endif
+ return retval;
+ }
+
+ void
+ gq_keyring_save_server_password(struct ldapserver* server) {
++#if 0
+ GnomeKeyringAttributeList* list = NULL;
+ gchar* display_name = NULL;
+ guint32 id = 0;
+@@ -125,5 +138,6 @@
+ &id);
+ gnome_keyring_attribute_list_free(list);
+ g_free(display_name);
++#endif
+ }
+
+Index: src/gq-keyring.h
+--- src/gq-keyring.h.orig 2006-05-19 18:00:27 +0200
++++ src/gq-keyring.h 2006-08-27 12:21:08 +0200
+@@ -24,17 +24,25 @@
+ #ifndef GQ_KEYRING_H
+ #define GQ_KEYRING_H
+
++#if 0
+ #include <gnome-keyring.h>
++#else
++typedef int GnomeKeyringAttributeList;
++#endif
+ #include "common.h" // for ldapserver
+
+ G_BEGIN_DECLS
+
++
+ GnomeKeyringAttributeList*
+ gq_keyring_attribute_list_from_server(struct ldapserver* server);
+ void gq_keyring_forget_password (struct ldapserver* server);
+ gchar* gq_keyring_get_password (struct ldapserver*
server);
+ void gq_keyring_save_server_password (struct ldapserver*
server);
+
++#define gnome_keyring_is_available() 0
++#define gnome_keyring_free_password(n) (void)0
++
+ G_END_DECLS
+
+ #endif /* !GQ_KEYRING_H */
Index: src/state.c
---- src/state.c.orig 2006-04-05 02:53:55 +0200
-+++ src/state.c 2006-04-05 19:14:43 +0200
-@@ -754,7 +754,7 @@
+--- src/state.c.orig 2006-05-23 19:14:47 +0200
++++ src/state.c 2006-08-27 12:18:46 +0200
+@@ -744,7 +744,7 @@
}
}
@@ -11,8 +200,8 @@
assert(v);
Index: src/xmlparse.c
---- src/xmlparse.c.orig 2006-04-05 02:49:19 +0200
-+++ src/xmlparse.c 2006-04-05 19:23:16 +0200
+--- src/xmlparse.c.orig 2006-05-23 18:16:42 +0200
++++ src/xmlparse.c 2006-08-27 12:18:46 +0200
@@ -51,7 +51,7 @@
#include "xmlparse.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gq/gq.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 gq.spec
--- openpkg-src/gq/gq.spec 24 May 2006 18:51:49 -0000 1.15
+++ openpkg-src/gq/gq.spec 27 Aug 2006 10:24:34 -0000 1.16
@@ -23,8 +23,8 @@
##
# package version
-%define V_dist 1.0.0
-%define V_opkg 1.0.0
+%define V_dist 1.1.0
+%define V_opkg 1.1.0
# package information
Name: gq
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20060524
+Release: 20060827
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/gqclient/gq-%{V_dist}.tar.gz
@@ -88,6 +88,7 @@
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/locale
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
