packages: turbovnc/turbovnc.spec - server and utils packages - drop Xserver...

[baggins]

Author: baggins                      Date: Wed Aug 31 20:39:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- server and utils packages
- drop Xserver man page, it has nothing to do with vnc

---- Files affected:
packages/turbovnc:
   turbovnc.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/turbovnc/turbovnc.spec
diff -u packages/turbovnc/turbovnc.spec:1.1 packages/turbovnc/turbovnc.spec:1.2
--- packages/turbovnc/turbovnc.spec:1.1	Wed Aug 31 22:20:36 2011
+++ packages/turbovnc/turbovnc.spec	Wed Aug 31 22:39:06 2011
@@ -24,6 +24,39 @@
 fast VNC distribution, containing a high-performance implementation of
 Tight encoding designed to work in conjunction with VirtualGL.
 
+%package server
+Summary:	VNC X server - TurboVNC version
+Summary(pl.UTF-8):	X serwer VNC - wersja TurboVNC
+Group:		X11/Applications/Networking
+Requires:	xorg-app-rgb
+# for vncpasswd tool
+Requires:	%{name}-utils = %{version}-%{release}
+# for mcookie
+Requires:	util-linux
+Requires:	libjpeg-turbo
+Obsoletes:	vnc-server
+
+%description server
+This package contains VNC X server in TurboVNC version.
+
+%description server -l pl.UTF-8
+Ten pakiet zawiera X serwer VNC w wersji TurboVNC.
+
+%package utils
+Summary:	Additional utilities for TigerVNC
+Summary(pl.UTF-8):	Dodatkowe narzędzia do TigerVNC
+Group:		X11/Applications/Networking
+Obsoletes:	vnc-utils
+
+%description utils
+This package contains additional TigerVNC utilities: vncpasswd.
+vncpasswd generates password file (both on server and viewer side).
+
+%description utils -l pl.UTF-8
+Ten pakiet zawiera dodatkowe narzędzia do turbovnc: vncpasswd.
+vncpasswd służy to tworzenia pliku z hasłem (zarówno po
+stronie serwera, jak i przeglądarki).
+
 %prep
 %setup -q -n vnc/vnc_unixsrc
 %patch0 -p2
@@ -54,48 +87,55 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%if 0
+%post server
 if [ "$1" = 1 ]; then
 	/sbin/chkconfig --add tvncserver;
 fi
 
-%preun
+%preun server
 if [ "$1" = 0 ]; then
 	/etc/init.d/tvncserver stop >/dev/null 2>&1
 	/sbin/chkconfig --del tvncserver
 fi
 
-%postun
+%postun server
 if [ "$1" -ge "1" ]; then
 	/etc/init.d/tvncserver condrestart >/dev/null 2>&1
 fi
+%endif
 
 %files
 %defattr(644,root,root,755)
 %doc LICENCE.TXT  ../TurboVNC-ChangeLog.txt
 %doc ../vnc_docs/{LICEN*.txt,*.html,*.png,*.css}
-#%attr(754,root,root) /etc/rc.d/init.d/tvncserver
-#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tvncservers
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/turbovncserver.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/turbovncserver-auth.conf
 %attr(755,root,root) %{_bindir}/vncviewer
-%attr(755,root,root) %{_bindir}/Xvnc
-%attr(755,root,root) %{_bindir}/vncserver
-%attr(755,root,root) %{_bindir}/vncpasswd
-%attr(755,root,root) %{_bindir}/vncconnect
-%attr(755,root,root) %{_bindir}/autocutsel
 %dir %{_datadir}/turbovnc
 %dir %{_datadir}/turbovnc/classes
 %{_datadir}/turbovnc/classes/index.vnc
 %{_datadir}/turbovnc/classes/VncViewer.jar
 %{_datadir}/turbovnc/classes/README
 %{_desktopdir}/turbovnc.desktop
+%{_mandir}/man1/vncviewer.1*
+
+%files server
+%defattr(644,root,root,755)
+#%attr(754,root,root) /etc/rc.d/init.d/tvncserver
+#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tvncservers
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/turbovncserver.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/turbovncserver-auth.conf
+%attr(755,root,root) %{_bindir}/Xvnc
+%attr(755,root,root) %{_bindir}/autocutsel
+%attr(755,root,root) %{_bindir}/vncconnect
+%attr(755,root,root) %{_bindir}/vncserver
 %{_mandir}/man1/Xvnc.1*
-%{_mandir}/man1/Xserver.1*
-%{_mandir}/man1/vncserver.1*
 %{_mandir}/man1/vncconnect.1*
+%{_mandir}/man1/vncserver.1*
+
+%files utils
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vncpasswd
 %{_mandir}/man1/vncpasswd.1*
-%{_mandir}/man1/vncviewer.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +143,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/08/31 20:39:06  baggins
+- server and utils packages
+- drop Xserver man page, it has nothing to do with vnc
+
 Revision 1.1  2011/08/31 20:20:36  baggins
 - very initial revision
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/turbovnc/turbovnc.spec?r1=1.1&r2=1.2&f=u