packages: libtirpc/libtirpc.spec, libtirpc/libtirpc-heimdal.patch (NEW) - r...

[baggins]

Author: baggins                      Date: Tue Jun 30 13:04:47 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6
- added heimdal bcond and patch allowing to use heimdal-gssapi in place of libgssglue

---- Files affected:
packages/libtirpc:
   libtirpc.spec (1.17 -> 1.18) , libtirpc-heimdal.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libtirpc/libtirpc.spec
diff -u packages/libtirpc/libtirpc.spec:1.17 packages/libtirpc/libtirpc.spec:1.18
--- packages/libtirpc/libtirpc.spec:1.17	Thu Apr  2 23:58:37 2009
+++ packages/libtirpc/libtirpc.spec	Tue Jun 30 15:04:42 2009
@@ -1,9 +1,13 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	heimdal		# build with Heimdal Kerberos instead of MIT
+#
 Summary:	Transport Independent RPC Library
 Summary(pl.UTF-8):	Biblioteka RPC niezależnego od transportu
 Name:		libtirpc
 Version:	0.1.10
-Release:	5
+Release:	6
 Epoch:		1
 License:	BSD-like
 Group:		Libraries
@@ -11,10 +15,16 @@
 # Source0-md5:	4192ad1c683abb7eb2ca77d5fd64e54b
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-git.patch
+Patch2:		%{name}-heimdal.patch
 URL:		http://sourceforge.net/projects/libtirpc/
 BuildRequires:	autoconf
 BuildRequires:	automake
+%if %{with heimdal}
+BuildRequires:	heimdal-devel
+BuildConflicts:	libgssglue-devel
+%else
 BuildRequires:	libgssglue-devel >= 0.1
+%endif
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 Requires:	libgssglue >= 0.1
@@ -75,6 +85,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -131,6 +142,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/06/30 13:04:42  baggins
+- rel 6
+- added heimdal bcond and patch allowing to use heimdal-gssapi in place of libgssglue
+
 Revision 1.17  2009/04/02 21:58:37  qboosh
 - more verbose files
 

================================================================
Index: packages/libtirpc/libtirpc-heimdal.patch
diff -u /dev/null packages/libtirpc/libtirpc-heimdal.patch:1.1
--- /dev/null	Tue Jun 30 15:04:47 2009
+++ packages/libtirpc/libtirpc-heimdal.patch	Tue Jun 30 15:04:42 2009
@@ -0,0 +1,30 @@
+diff -ur libtirpc-0.1.10/configure.in libtirpc-0.1.10-heimdal/configure.in
+--- libtirpc-0.1.10/configure.in	2008-11-19 14:01:43.000000000 +0100
++++ libtirpc-0.1.10-heimdal/configure.in	2009-06-30 14:52:36.541185534 +0200
+@@ -11,8 +11,12 @@
+       esac],[gss=false])
+ AM_CONDITIONAL(GSS, test x$gss = xtrue)
+ if test x$gss = xtrue; then
+-	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_SUBST([GSSAPI_IMPLEMENTATION])
+ fi
+ 
+ 
+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
+@@ -5,7 +5,7 @@
+ 
+ Name: libtirpc
+ Description: Transport Independent RPC Library
+-Requires:
++Requires: @GSSAPI_IMPLEMENTATION@
+ Version: @PACKAGE_VERSION@
+ Libs: -L at libdir@ -ltirpc
+ Cflags: -I at includedir@/tirpc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtirpc/libtirpc.spec?r1=1.17&r2=1.18&f=u