rpms/gq/F-10 gq-1.3.4-configure.patch, NONE, 1.1 gq-1.3.4-kerberos.patch, NONE, 1.1 gq.spec, 1.10, 1.11

[terjeros]

Author: terjeros

Update of /cvs/extras/rpms/gq/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21613/F-10

Modified Files:
	gq.spec 
Added Files:
	gq-1.3.4-configure.patch gq-1.3.4-kerberos.patch 
Log Message:
Sync with rawhide.



gq-1.3.4-configure.patch:
 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gq-1.3.4-configure.patch ---
--- configure~	2008-02-13 22:14:37.000000000 +0100
+++ configure	2009-11-06 10:28:57.000000000 +0100
@@ -6608,8 +6608,9 @@
 
 # Check whether --with-kerberos-prefix was given.
 if test "${with_kerberos_prefix+set}" = set; then
+  KRB5_LIBS="`$with_kerberos_prefix/bin/krb5-config --libs`"
   withval=$with_kerberos_prefix;
-	     LIBS="-L$with_kerberos_prefix/lib -lkrb5 -ldes425 $LIBS"
+	     LIBS="-L$with_kerberos_prefix/lib $KRB5_LIBS $LIBS"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_KERBEROS 1

gq-1.3.4-kerberos.patch:
 gq-server.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gq-1.3.4-kerberos.patch ---
--- gq-1.3.4/src/gq-server.c~	2008-01-09 17:35:12.000000000 +0100
+++ gq-1.3.4/src/gq-server.c	2009-11-05 18:41:28.000000000 +0100
@@ -281,7 +281,7 @@
 			switch(gq_server_get_bind_type(server)) {
 				case GQ_BIND_KERBEROS:
 #ifdef HAVE_KERBEROS
-					rc = ldap_bind_s(ld, bind_dn, bindpw, LDAP_AUTH_KRBV4);
+					rc = ldap_bind_s(ld, bind_dn, bind_pw, LDAP_AUTH_KRBV4);
 #else
 					error_push(open_context,
 						_("Cannot use Kerberos bind with '%s'.\n"


Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/F-10/gq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gq.spec	1 Sep 2008 20:10:14 -0000	1.10
+++ gq.spec	8 Nov 2009 13:33:11 -0000	1.11
@@ -1,14 +1,16 @@
-Summary: Graphical LDAP directory browser and editor
-Name:    gq
-Version: 1.3.4
-Release: 2%{?dist}
-License: GPLv2+
-Group:   Applications/Internet
-URL:     http://www.gq-project.org/
-Source0: http://dl.sf.net/sourceforge/gqclient/%{name}-%{version}.tar.gz
-Patch0:  gq-1.2.1-desktop.patch
+Summary:       Graphical LDAP directory browser and editor
+Name:          gq
+Version:       1.3.4
+Release:       8%{?dist}
+License:       GPLv2+
+Group:         Applications/Internet
+URL:           http://www.gq-project.org/
+Source0:       http://dl.sf.net/sourceforge/gqclient/%{name}-%{version}.tar.gz
+Patch0:        gq-1.2.1-desktop.patch
+Patch1:        gq-1.3.4-kerberos.patch
+Patch2:        gq-1.3.4-configure.patch
 BuildRequires: gtk2-devel libglade2-devel libgcrypt-devel
-BuildRequires: gnome-keyring-devel libxml2-devel
+BuildRequires: gnome-keyring-devel libxml2-devel krb5-devel
 Buildrequires: gettext desktop-file-utils gnome-doc-utils
 BuildRequires: openldap-devel openssl-devel
 BuildRequires: perl(XML::Parser)
@@ -24,6 +26,8 @@ stored in that directory.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p0
 
 %build
 %configure --with-included-gettext      \
@@ -31,7 +35,9 @@ stored in that directory.
            --with-default-codeset=UTF-8 \
            --disable-scrollkeeper       \
            --enable-cache               \
-           --enable-browser-dnd
+           --enable-browser-dnd         \
+           --with-kerberos-prefix=%{_prefix}/kerberos
+
 %{__make} %{?_smp_mflags}
 
 for f in TODO AUTHORS ChangeLog ; do
@@ -89,6 +95,25 @@ fi
 %dir %{_datadir}/%{name}
 
 %changelog
+* Sun Nov 08 2009 Terje Røsten <terje.rosten at ntnu.no> - 1.3.4-8
+- Add patch to build with krb5 1.7, thanks to Nalin for help
+
+* Thu Nov 05 2009 Terje Røsten <terje.rosten at ntnu.no> - 1.3.4-7
+- Build with kerberos support (bz #522095)
+- Add patch to fix typo in kerberos code
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-6
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-3
+- rebuild with new openssl
+
 * Mon Sep  1 2008 Terje Røsten <terje.rosten at ntnu.no> - 1.3.4-2
 - adapt to new rpm patch macro policy