[Ovirt-devel] From: Alan Pevec <apevec at redhat.com>

[Alan Pevec]

remove obsolete rubygem-kerberos and its references in ruby source

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 srpms/rubygem-kerberos-0.4-1.fc8.src.rpm |  Bin 11611 -> 0 bytes
 wui/ovirt-wui.spec                       |   13 ++++++++-----
 wui/src/dutils/dutils.rb                 |    4 ++--
 wui/src/host-keyadd/host-keyadd.rb       |    6 ++----
 4 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 srpms/rubygem-kerberos-0.4-1.fc8.src.rpm

diff --git a/srpms/rubygem-kerberos-0.4-1.fc8.src.rpm b/srpms/rubygem-kerberos-0.4-1.fc8.src.rpm
deleted file mode 100644
index 3a302d53f0e3216c9b80b9abb4ad47e57a456fd9..0000000000000000000000000000000000000000

diff --git a/wui/ovirt-wui.spec b/wui/ovirt-wui.spec
index ebf1d94..269b7de 100644
--- a/wui/ovirt-wui.spec
+++ b/wui/ovirt-wui.spec
@@ -1,7 +1,7 @@
 %define pbuild %{_builddir}/%{name}-%{version}
 %define app_root %{_datadir}/%{name}
 
-Summary: Ovirt front end WUI
+Summary: oVirt front end WUI
 Name: ovirt-wui
 Source1: version
 Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
@@ -17,7 +17,7 @@ Requires: ruby(abi) = 1.8
 Requires: rubygem(activeldap) >= 0.10.0
 Requires: rubygem(rails) >= 2.0.1
 Requires: rubygem(mongrel) >= 1.0.1
-Requires: rubygem(kerberos) >= 0.4
+Requires: rubygem(krb5-auth) >= 0.6
 Requires: ruby-gettext-package
 Requires: postgresql-server
 Requires: ruby-postgres
@@ -38,11 +38,11 @@ BuildRequires: avahi-devel
 Provides: ovirt-wui
 BuildArch: i386 x86_64
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-URL: http://ovirt.et.redhat.com
+URL: http://ovirt.org/
 
 %description
 
-The webapp for Ovirt.
+The webapp for oVirt.
 
 %prep
 %setup -q
@@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 /usr/sbin/groupadd -r ovirt 2>/dev/null || :
-/usr/sbin/useradd -g ovirt -c "Ovirt" \
+/usr/sbin/useradd -g ovirt -c "oVirt" \
     -s /sbin/nologin -r -d /var/ovirt ovirt 2> /dev/null || :
 
 %post
@@ -150,6 +150,9 @@ if [ "$1" = 0 ] ; then
   /sbin/chkconfig --del ovirt-taskomatic
 fi
 %changelog
+* Thu May 29 2008 Alan Pevec <apevec at redhat.com> - 0.0.5-0
+- use rubygem-krb5-auth
+
 * Fri Nov  2 2007  <sseago at redhat.com> - 0.0.1-1
 - Initial build.
 
diff --git a/wui/src/dutils/dutils.rb b/wui/src/dutils/dutils.rb
index b1a1248..a90c068 100644
--- a/wui/src/dutils/dutils.rb
+++ b/wui/src/dutils/dutils.rb
@@ -17,8 +17,8 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 require 'active_record_env'
-require 'kerberos'
-include Kerberos
+require 'krb5_auth'
+include Krb5Auth
 
 ENV['KRB5CCNAME'] = '/usr/share/ovirt-wui/ovirt-cc'
 
diff --git a/wui/src/host-keyadd/host-keyadd.rb b/wui/src/host-keyadd/host-keyadd.rb
index e9b3450..d88abc9 100755
--- a/wui/src/host-keyadd/host-keyadd.rb
+++ b/wui/src/host-keyadd/host-keyadd.rb
@@ -20,8 +20,8 @@
 
 require 'socket'
 require 'rubygems'
-require 'kerberos'
-include Kerberos
+require 'krb5_auth'
+include Krb5Auth
 require 'optparse'
 require 'daemons'
 include Daemonize
@@ -29,8 +29,6 @@ include Daemonize
 $logfile = '/var/log/ovirt-wui/host-keyadd.log'
 
 def kadmin_local(command)
-  # FIXME: we really should implement the ruby-kerberos bindings to do the
-  # same thing as kadmin.local
   # FIXME: we should check the return value from the system() call and throw
   # an exception.
   # FIXME: we need to return the output back to the caller here
-- 
1.5.4.1