Tue Dec 18 11:47:02 UTC 2007

Author: lkundrak

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10792/devel

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.22-vncviewer.patch 
Removed Files:
	avahi-0.6.11-align.patch avahi-0.6.11-use-ipv6-yes.patch 
	avahi-0.6.15-initscript.patch avahi-0.6.15-netdev.patch 
	avahi-0.6.17-exitcode.patch avahi-0.6.20-arp-packet-fix.patch 
	avahi-0.6.20-cleanup-dns-compression-table.patch 
	avahi-0.6.20-make-known-answers-not-conflict.patch 
	avahi-0.6.21-avahi-browse-help-fix.patch 
	avahi-0.6.21-initscript.patch avahi-0.6.21-libdns_sd-fix.patch 
	avahi-0.6.21-resolv-conf.patch avahi-0.6.9-bz189427.patch 
Log Message:
Fix vncviewer calls, add dependency on it


avahi-0.6.22-vncviewer.patch:

--- NEW FILE avahi-0.6.22-vncviewer.patch ---
VNC viewer binary in Fedora is vncviewer, not xvncviewer
(Lubomir Kundrak <lkundrak at redhat.com>)

diff -urp avahi-0.6.22.orig/avahi-ui/bssh.c avahi-0.6.22/avahi-ui/bssh.c
--- avahi-0.6.22.orig/avahi-ui/bssh.c	2007-12-17 16:12:57.000000000 +0100
+++ avahi-0.6.22/avahi-ui/bssh.c	2007-12-18 11:46:15.000000000 +0100
@@ -86,8 +86,8 @@ int main(int argc, char*argv[]) {
 
             gtk_widget_destroy(d);
 
-            g_print("xvncviewer %s\n", p);
-            execlp("xvncviewer", "xvncviewer", p, NULL);
+            g_print("vncviewer %s\n", p);
+            execlp("vncviewer", "vncviewer", p, NULL);
 
         } else {
             char p[16];
diff -urp avahi-0.6.22.orig/man/bssh.1 avahi-0.6.22/man/bssh.1
--- avahi-0.6.22.orig/man/bssh.1	2007-12-17 16:40:46.000000000 +0100
+++ avahi-0.6.22/man/bssh.1	2007-12-18 11:46:56.000000000 +0100
@@ -7,12 +7,12 @@ bssh/bvnc \- Browse for SSH/VNC servers 
 bvnc
 \f1
 .SH DESCRIPTION
-bssh/bvnc browses for local SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/xvncviewer after a selection was made.
+bssh/bvnc browses for local SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made.
 .SH OPTIONS
 bssh/bvnc takes no command line arguments at the moment.
 .SH AUTHORS
 The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
 .SH SEE ALSO
-\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBxvncviewer(1)\f1
+\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1
 .SH COMMENTS
 This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff -urp avahi-0.6.22.orig/man/bssh.1.xml.in avahi-0.6.22/man/bssh.1.xml.in
--- avahi-0.6.22.orig/man/bssh.1.xml.in	2007-09-03 14:32:47.000000000 +0200
+++ avahi-0.6.22/man/bssh.1.xml.in	2007-12-18 11:46:40.000000000 +0100
@@ -33,7 +33,7 @@
     <description>
       <p>bssh/bvnc browses for local SSH/VNC servers on the local
       network, shows them in a GUI for the user to select one and
-      finally calls ssh/xvncviewer after a selection was made.</p>
+      finally calls ssh/vncviewer after a selection was made.</p>
     
     </description>
 	
@@ -50,7 +50,7 @@
 	
     <section name="See also">
       <p>
-        <manref name="avahi-browse" section="1"/>, <manref name="ssh" section="1"/>, <manref name="xvncviewer" section="1"/>
+        <manref name="avahi-browse" section="1"/>, <manref name="ssh" section="1"/>, <manref name="vncviewer" section="1"/>
       </p>
     </section>
     


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- avahi.spec	17 Dec 2007 19:30:11 -0000	1.99
+++ avahi.spec	18 Dec 2007 11:46:28 -0000	1.100
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPLv2
@@ -38,6 +38,7 @@
 Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
 # enable mono's mcs to work in beehive buildroot:
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
+Patch3:     avahi-0.6.22-vncviewer.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -61,6 +62,8 @@
 Group: System Environment/Base
 Requires: %{name} = %{version}
 Requires: %{name}-ui = %{version}
+Requires: vnc
+Requires: openssh-clients
 
 %description ui-tools
 Graphical user interface tools that use Avahi to browse for mDNS services.
@@ -240,6 +243,7 @@
 %if %{WITH_MONO}
 %patch2 -p1 -b .MONO_SHARED_DIR
 %endif
+%patch3 -p1 -b .vncviewer
 
 %build
 
@@ -516,6 +520,10 @@
 %endif
 
 %changelog
+* Tue Dec 18 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.6.22-4
+- Make bvnc call vncviewer instead of xvncviewer
+- Let ui-tools depend on necessary packages
+
 * Mon Dec 17 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.22-3
 - Add missing intltool dependency
 


--- avahi-0.6.11-align.patch DELETED ---


--- avahi-0.6.11-use-ipv6-yes.patch DELETED ---


--- avahi-0.6.15-initscript.patch DELETED ---


--- avahi-0.6.15-netdev.patch DELETED ---


--- avahi-0.6.17-exitcode.patch DELETED ---


--- avahi-0.6.20-arp-packet-fix.patch DELETED ---


--- avahi-0.6.20-cleanup-dns-compression-table.patch DELETED ---


--- avahi-0.6.20-make-known-answers-not-conflict.patch DELETED ---


--- avahi-0.6.21-avahi-browse-help-fix.patch DELETED ---


--- avahi-0.6.21-initscript.patch DELETED ---


--- avahi-0.6.21-libdns_sd-fix.patch DELETED ---


--- avahi-0.6.21-resolv-conf.patch DELETED ---


--- avahi-0.6.9-bz189427.patch DELETED ---


