rpms/freenx/F-7 freenx.spec,1.10,1.11

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/freenx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22776/F-7

Modified Files:
	freenx.spec 
Log Message:
Backport fixes from rawhide.


Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/F-7/freenx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- freenx.spec	10 Dec 2007 18:08:33 -0000	1.10
+++ freenx.spec	24 Mar 2008 09:25:29 -0000	1.11
@@ -5,14 +5,17 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
 Version: 0.7.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
 Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Source1: freenx.logrotate
+Patch0: freenx-0.7.1-sharing_and_multimedia_fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
+Requires: nx
+Requires: openssh-server nc expect which perl
+Requires: xorg-x11-server-Xorg xorg-x11-apps
 
 %description
 NX is an exciting new technology for remote display. It provides near
@@ -22,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .sharing_and_multimedia
 
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
@@ -80,7 +84,9 @@
 fi
 
 echo -n "127.0.0.1 " > /var/lib/nxserver/home/.ssh/known_hosts
-cat /etc/ssh/ssh_host_rsa_key.pub >> /var/lib/nxserver/home/.ssh/known_hosts
+# We do depend on openssh-server, but package installation != key
+# creation time. See also Fedora bug #235592
+cat /etc/ssh/ssh_host_rsa_key.pub >> /var/lib/nxserver/home/.ssh/known_hosts 2>/dev/null
 chown nx:root /var/lib/nxserver/home/.ssh/known_hosts
 
 %files
@@ -95,6 +101,13 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/freenx
 
 %changelog
+* Mon Dec 31 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.1-4
+- Apply Jeffrey J. Kosowsky's patches to enable multimedia and
+  file/print sharing support (Fedora bug #216802).
+- Silence %%post output, when openssh's server has never been started
+  before (Fedora bug #235592).
+- Add dependency on which (Fedora bug #250343).
+
 * Mon Dec 10 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.1-3
 - Fix syntax error in logrotate file, BZ 418221.