SPECS: librpcsecgss.spec - updated to 0.7, removed outdated config...

[qboosh]

Author: qboosh                       Date: Fri Dec  9 21:03:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.7, removed outdated configure patch
- added conditional heimdal patch

---- Files affected:
SPECS:
   librpcsecgss.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/librpcsecgss.spec
diff -u SPECS/librpcsecgss.spec:1.4 SPECS/librpcsecgss.spec:1.5
--- SPECS/librpcsecgss.spec:1.4	Sat Aug  6 13:18:13 2005
+++ SPECS/librpcsecgss.spec	Fri Dec  9 22:02:58 2005
@@ -1,21 +1,29 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	libgssapi	# use libgssapi glue instead of heimdal directly
+#
 Summary:	rpcsec_gss implementation library
 Summary(pl):	Biblioteka implementująca rpcsec_gss
 Name:		librpcsecgss
-Version:	0.6
+Version:	0.7
 Release:	1
 License:	mixture of UM and Sun licenses
 Group:		Libraries
 Source0:	http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{name}-%{version}.tar.gz
-# Source0-md5:	962da89d2f2e7a70b2b90cb125cbceaa
-Patch0:		%{name}-configure.patch
+# Source0-md5:	08d07cb462555c00cfba6708112a646a
+Patch0:		%{name}-heimdal.patch
 URL:		http://www.citi.umich.edu/projects/nfsv4/linux/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	heimdal-devel >= 0.7
 BuildRequires:	libtool
-# it's checked before heimdal (which is preferred in PLD)
-BuildConflicts:	krb5-devel
+%if %{with libgssapi}
+BuildRequires:	libgssapi-devel >= 0.6
+BuildRequires:	pkgconfig
+Requires:	libgssapi >= 0.6
+%else
+BuildRequires:	heimdal-devel
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,7 +39,11 @@
 Summary(pl):	Pliki programistyczne biblioteki librpcsecgss
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%if %{with libgssapi}
+Requires:	libgssapi-devel >= 0.6
+%else
 Requires:	heimdal-devel
+%endif
 
 %description devel
 Development files for librpcsecgss library.
@@ -53,16 +65,20 @@
 
 %prep
 %setup -q
+%if %{without libgssapi}
 %patch0 -p1
+sed -i -e 's,gssapi/gssapi\.h,gssapi.h,' include/rpcsecgss/rpc/auth_gss.h \
+	src/{authgss_prot,auth_gss,svc_auth_gss}.c
+%endif
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure \
-	--with-krb5=/usr
-%{__make}
+%configure
+%{__make} \
+	librpcsecgss_la_LIBADD='$(GSSAPI_LIBS)'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +101,8 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librpcsecgss.so
 %{_libdir}/librpcsecgss.la
+%{_includedir}/rpcsecgss
+%{_pkgconfigdir}/librpcsecgss.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -96,6 +114,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/12/09 21:02:58  qboosh
+- updated to 0.7, removed outdated configure patch
+- added conditional heimdal patch
+
 Revision 1.4  2005/08/06 11:18:13  qboosh
 - updated to 0.6 (note: new soname)
 - updated configure patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/librpcsecgss.spec?r1=1.4&r2=1.5&f=u