packages: libtirpc/libtirpc-heimdal.patch, libtirpc/libtirpc.spec - impleme...

[qboosh]

Author: qboosh                       Date: Sat Aug 14 07:09:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- implemented heimdal patch in more flexible way, allowing to choose heimdal even if libgssglue is installed
- renamed krb5 bcond to gssglue (this is that the bcond does)

---- Files affected:
packages/libtirpc:
   libtirpc-heimdal.patch (1.2 -> 1.3) , libtirpc.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/libtirpc/libtirpc-heimdal.patch
diff -u packages/libtirpc/libtirpc-heimdal.patch:1.2 packages/libtirpc/libtirpc-heimdal.patch:1.3
--- packages/libtirpc/libtirpc-heimdal.patch:1.2	Wed Feb 24 17:11:33 2010
+++ packages/libtirpc/libtirpc-heimdal.patch	Sat Aug 14 09:08:55 2010
@@ -1,21 +1,34 @@
-diff -ur libtirpc-0.1.10/configure.ac libtirpc-0.1.10-heimdal/configure.ac
---- libtirpc-0.1.10/configure.ac	2008-11-19 14:01:43.000000000 +0100
-+++ libtirpc-0.1.10-heimdal/configure.ac	2009-06-30 14:52:36.541185534 +0200
-@@ -11,8 +11,12 @@
+--- libtirpc-0.2.1/configure.ac.orig	2009-11-30 15:04:55.000000000 +0100
++++ libtirpc-0.2.1/configure.ac	2010-08-14 08:49:50.618819943 +0200
+@@ -3,16 +3,23 @@
+ AM_MAINTAINER_MODE
+ AC_CONFIG_SRCDIR([src/auth_des.c])
+ 
++GSSAPI_IMPLEMENTATION=libgssglue
+ AC_ARG_ENABLE(gss,[  --enable-gss            Turn on gss api], [case "${enableval}" in
+-        yes) gss=true ; AC_CHECK_LIB([gssapi],[gss_init_sec_context]) ;;
++        yes) gss=true ;;
+         no)  gss=false ;;
+-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;;
++        *) gss=true; GSSAPI_IMPLEMENTATION="$enableval" ;;
+       esac],[gss=false])
  AM_CONDITIONAL(GSS, test x$gss = xtrue)
  if test x$gss = xtrue; then
- 	AC_DEFINE(HAVE_LIBGSSAPI, 1, [])
+-	AC_DEFINE(HAVE_LIBGSSAPI, 1, [])
 -	PKG_CHECK_MODULES(GSSGLUE, libgssglue, [],
 -	AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
-+	PKG_CHECK_MODULES([GSSGLUE], [libgssglue],
-+		[echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue],
-+		[PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
-+		[echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi],
-+	[AC_MSG_ERROR([Unable to locate information required to use libgssglue.])])])
++	AC_DEFINE(HAVE_LIBGSSAPI, 1, [Have GSSAPI])
++	PKG_CHECK_MODULES([GSSGLUE], [$GSSAPI_IMPLEMENTATION],
++		[echo GSSAPI in $GSSAPI_IMPLEMENTATION],
++		[PKG_CHECK_MODULES([GSSGLUE], [libgssglue],
++			[echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue],
++			[PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
++				[echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi],
++				[AC_MSG_ERROR([Unable to locate information required to use libgssglue.])])])])
 +AC_SUBST([GSSAPI_IMPLEMENTATION])
  fi
  
- 
+ AC_PROG_CC
 diff -ur libtirpc-0.1.10/libtirpc.pc.in libtirpc-0.1.10-heimdal/libtirpc.pc.in
 --- libtirpc-0.1.10/libtirpc.pc.in	2008-11-19 14:01:43.000000000 +0100
 +++ libtirpc-0.1.10-heimdal/libtirpc.pc.in	2009-06-30 14:55:59.811577076 +0200

================================================================
Index: packages/libtirpc/libtirpc.spec
diff -u packages/libtirpc/libtirpc.spec:1.25 packages/libtirpc/libtirpc.spec:1.26
--- packages/libtirpc/libtirpc.spec:1.25	Sat Feb 27 22:11:19 2010
+++ packages/libtirpc/libtirpc.spec	Sat Aug 14 09:08:55 2010
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	krb5		# build with MIT Kerberos instead of Heimdal
+%bcond_with	gssglue		# build with MIT Kerberos instead of Heimdal
 #
 Summary:	Transport Independent RPC Library
 Summary(pl.UTF-8):	Biblioteka RPC niezależnego od transportu
@@ -11,23 +11,22 @@
 Epoch:		1
 License:	BSD-like
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/sourceforge/libtirpc/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/libtirpc/%{name}-%{version}.tar.bz2
 # Source0-md5:	d77eb15f464bf9d6e66259eaf78b2a4e
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-heimdal.patch
 Patch2:		%{name}-XDR_GETPOS.patch
 URL:		http://sourceforge.net/projects/libtirpc/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-%if %{with krb5}
+%if %{with gssglue}
 BuildRequires:	libgssglue-devel >= 0.1
 %else
 BuildRequires:	heimdal-devel
-BuildConflicts:	libgssglue-devel
 %endif
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-%if %{with krb5}
+%if %{with gssglue}
 Requires:	libgssglue >= 0.1
 %else
 Requires:	heimdal-libs
@@ -63,7 +62,7 @@
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki TI-RPC
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-%if %{with krb5}
+%if %{with gssglue}
 Requires:	libgssglue-devel >= 0.1
 %else
 Requires:	heimdal-devel
@@ -102,7 +101,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-gss
+	--enable-gss=%{?with_gssglue:libgssglue}%{!?with_gssglue:heimdal-gssapi}
 
 %{__make}
 
@@ -153,6 +152,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/08/14 07:08:55  qboosh
+- implemented heimdal patch in more flexible way, allowing to choose heimdal even if libgssglue is installed
+- renamed krb5 bcond to gssglue (this is that the bcond does)
+
 Revision 1.25  2010/02/27 21:11:19  sparky
 - unify %attr() %ghost order
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtirpc/libtirpc-heimdal.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtirpc/libtirpc.spec?r1=1.25&r2=1.26&f=u