X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=mech_eap.spec.in;h=4d682740b276e21f87178f8e6485fc48ae1b7744;hp=90ac6cf5b0ba6b646db0ecb345a1864fe23be1e6;hb=HEAD;hpb=a3765f5798e969fc41b1ae5a525229a63652acf4

diff --git a/mech_eap.spec.in b/mech_eap.spec.in
index 90ac6cf..4d68274 100644
--- a/mech_eap.spec.in
+++ b/mech_eap.spec.in
@@ -1,7 +1,7 @@
 %global _moonshot_krb5 %{!?_moonshot_krb5:krb5-devel}%{?_moonshot_krb5}
 Name:		moonshot-gss-eap
 Version:	@VERSION@
-Release:	3%{?dist}
+Release:	2%{?dist}
 Summary:	Moonshot GSS-API Mechanism
 
 Group:		Security Tools
@@ -14,8 +14,8 @@ BuildRequires:	 %{_moonshot_krb5} >= 1.9.1
 BuildRequires:	 moonshot-ui-devel
 BuildRequires: jansson-devel
 Requires:	moonshot-ui
-BuildRequires: libradsec-devel
-BuildRequires: shibboleth-devel >= 2.5
+BuildRequires: libradsec-devel >= 0.0.3
+BuildRequires: shibboleth-sp-devel >= 2.5
 BuildRequires: libshibresolver-devel
 
 
@@ -29,8 +29,7 @@ Project Moonshot provides federated access management.
 
 
 %build
-	export LDFLAGS='-L/usr/%{_lib}/freeradius -Wl,--rpath=/usr/%{_lib}/freeradius'
-%configure  --with-libmoonshot=%{_prefix} --with-krb5=%{_prefix} --disable-reauth
+%configure  --with-libmoonshot=%{_prefix} --with-krb5=%{_prefix} --enable-reauth LDFLAGs="${LDFLAGS} -L/opt/shibboleth/%{_lib} -Wl,--rpath=/opt/shibboleth/%{_lib}" CPPFLAGS="${CPPFLAGS} -I/opt/shibboleth/include"
 make %{?_smp_mflags}
 
 
@@ -42,6 +41,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+oid_aes128=1.3.6.1.5.5.15.1.1.17
+oid_aes256=1.3.6.1.5.5.15.1.1.18
+mechfile=%{_sysconfdir}/gss/mech
+mkdir -p %{_sysconfdir}/gss
+test -e $mechfile |touch $mechfile
+fgrep $oid_aes128 $mechfile ||echo eap-aes128 $oid_aes128 mech_eap.so >>$mechfile
+fgrep $oid_aes256 $mechfile ||echo eap-aes256 $oid_aes256 mech_eap.so >>$mechfile
+
 
 %files
 %defattr(-,root,root,-)
@@ -51,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gss/mech_eap.so
 %exclude %{_libdir}/gss/mech_eap.la
 %{_includedir}/gssapi/*.h
-#%exclude %{_libdir}/krb5/plugins/authdata/*la
+%exclude %{_libdir}/krb5/plugins/authdata/*
 #%{_libdir}/krb5/plugins/authdata/*.so