rpms/gq/devel gq-1.3.4-configure.patch,NONE,1.1 gq.spec,1.15,1.16

[terjeros]

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20472

Modified Files:
	gq.spec 
Added Files:
	gq-1.3.4-configure.patch 
Log Message:
* 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


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


Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/gq.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gq.spec	5 Nov 2009 17:46:15 -0000	1.15
+++ gq.spec	8 Nov 2009 13:25:40 -0000	1.16
@@ -1,13 +1,14 @@
-Summary: Graphical LDAP directory browser and editor
-Name:    gq
-Version: 1.3.4
-Release: 7%{?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
+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 krb5-devel
 Buildrequires: gettext desktop-file-utils gnome-doc-utils
@@ -26,6 +27,7 @@ stored in that directory.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %build
 %configure --with-included-gettext      \
@@ -93,6 +95,9 @@ 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