ref: refs/heads/master commit ac08e6b7cb3e09be55e8541b82591157bb835b25 Author: Martin Vidner Date: Thu Oct 29 16:06:47 2009 +0100 Removed the avahi (zeroconf) dependency. The Slp module is unused, and avahi-utils is not available in SLE 11. --- webclient/lib/slp_scan.rb | 38 ----------------------------- webclient/package/yast2-webclient.changes | 6 ++++ webclient/package/yast2-webclient.spec | 6 ++-- 3 files changed, 9 insertions(+), 41 deletions(-) diff --git a/webclient/lib/slp_scan.rb b/webclient/lib/slp_scan.rb deleted file mode 100644 index d459aa3..0000000 --- a/webclient/lib/slp_scan.rb +++ /dev/null @@ -1,38 +0,0 @@ -# helper scan for hosts via slp -module Slp - require 'uri' - - def scan - hosts = [] - # make output parseable + terminate - services = `avahi-browse _yastws._tcp -t -p --no-db-lookup` - - # +;eth0;IPv4;YaST\032Webservice\032http\058\047\047aries\.suse\.de\0588080;_yastws._tcp;local - - services.each do |s| - sp = s.split ";" - next unless sp[0] == "+" - name = sp[3] - sp = name.split "\\" - name = "" - sp.each do |s| - if s.length > 2 - val = s[0,3].to_i - if val > 0 - s = val.chr + (s[3..-1] || "") - end - name << s - end - end - url = name.split(" ").pop || name - - if Host.find(:first, :conditions => "url = '#{url}'").nil? - host = Host.new({"url"=>url, "description"=>"via network scan"}) - next unless host - host.save - hosts << host - end - end - hosts - end -end diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index c610000..a05e9c0 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 29 16:10:31 CET 2009 - mvidner@suse.cz + +- Removed the avahi (zeroconf) dependency. +- 0.0.8 + +------------------------------------------------------------------- Wed Oct 28 13:24:40 UTC 2009 - dmacvicar@suse.de - better error messages (bnc#550033) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 3c95e4d..a4b33fc 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -10,14 +10,14 @@ Name: yast2-webclient -Requires: lighttpd-mod_magnet, ruby-fcgi, sqlite, avahi-utils +Requires: lighttpd-mod_magnet, ruby-fcgi, sqlite PreReq: lighttpd, rubygem-rake, rubygem-sqlite3 PreReq: rubygem-rails-2_3 = 2.3.4 PreReq: rubygem-gettext_rails License: LGPL v 2.1 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.7 +Version: 0.0.8 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 @@ -26,7 +26,7 @@ Source2: yastwc Source3: webyast.pem BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby -BuildRequires: sqlite avahi-utils rubygem-sqlite3 +BuildRequires: sqlite rubygem-sqlite3 BuildRequires: rubygem-rails-2_3 = 2.3.4 BuildRequires: rubygem-gettext_rails, rubygem-yast2-webservice-tasks, rubygem-selenium-client BuildRequires: tidy -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org