SPECS: vnc.spec - adapter, cleanups

glen glen at pld-linux.org
Tue Jan 8 01:55:45 CET 2008 

Author: glen                         Date: Tue Jan  8 00:55:45 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapter, cleanups

---- Files affected:
SPECS:
   vnc.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: SPECS/vnc.spec
diff -u SPECS/vnc.spec:1.76 SPECS/vnc.spec:1.77
--- SPECS/vnc.spec:1.76	Fri Nov  9 19:18:10 2007
+++ SPECS/vnc.spec	Tue Jan  8 01:55:40 2008
@@ -1,36 +1,32 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-#
 %define		docver		4.0
 %define		java_vncver	4_1
-%define         mesa_version    6.5.3
+%define		mesa_version    6.5.3
 %define		xserver_ver	1.3.0.0
-
 %define		xname		xorg-xserver-server
 
+%define		_ver	%(echo %{version} | tr . _)
 Summary:	Virtual Network Computing
 Summary(es.UTF-8):	Sistema de control remoto
 Summary(pl.UTF-8):	Virtual Network Computing - zdalny desktop
 Summary(pt_BR.UTF-8):	Sistema de controle remoto
 Name:		vnc
 Version:	4.1.2
-%define		_ver	%(echo %{version} | tr . _)
 Release:	2
 License:	GPL
 Group:		X11/Applications/Networking
-Source0:	http://fresh.t-systems-sfr.com/linux/src/vnc-%{_ver}-unixsrc.tar.gz
+Source0:	http://fresh.t-systems-sfr.com/linux/src/%{name}-%{_ver}-unixsrc.tar.gz
 # Source0-md5:	cf9a6fe8f592286b5e0fdde686504ffb
 Source1:	http://www.realvnc.com/dist/%{name}-%{docver}-documentation.tar.gz
 # Source1-md5:	eb3bf940b88cabb238580e2ba31b927b
-Source2:	http://fresh.t-systems-sfr.com/unix/src/misc/vnc-%{java_vncver}-javasrc.tar.gz
+Source2:	http://fresh.t-systems-sfr.com/unix/src/misc/%{name}-%{java_vncver}-javasrc.tar.gz
 # Source2-md5:	9407ce1f215aefca77bef12670745280
-Source3:	vncviewer.desktop
-Source4:	vnc-16x16.png
-Source5:	vnc-24x24.png
-Source6:	vnc-48x48.png
-Source7:	vncserver.init
-Source8:	vncserver.sysconfig
+Source3:	%{name}viewer.desktop
+Source4:	%{name}-16x16.png
+Source5:	%{name}-24x24.png
+Source6:	%{name}-48x48.png
+Source7:	%{name}server.init
+Source8:	%{name}server.sysconfig
 #Sources and patches above 100 belong to xserver
 Source100:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{xserver_ver}.tar.bz2
 # Source100-md5:	a51a7d482e3c689394755bb17bda8526
@@ -74,22 +70,22 @@
 URL:		http://www.realvnc.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
 BuildRequires:	gcc-java
 BuildRequires:	jar
-BuildRequires:	xorg-lib-libfontenc-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXfont-devel
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXtst-devel
-BuildRequires:	xorg-lib-libXfont-devel
+BuildRequires:	xorg-lib-libfontenc-devel
 BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xorg-lib-xtrans-devel
-BuildRequires:	xorg-proto-compositeproto-devel >= 0.3
 BuildRequires:	xorg-proto-bigreqsproto-devel
+BuildRequires:	xorg-proto-compositeproto-devel >= 0.3
 BuildRequires:	xorg-proto-damageproto-devel >= 1.1
 BuildRequires:	xorg-proto-fixesproto-devel >= 4.0
 BuildRequires:	xorg-proto-fontsproto-devel
@@ -101,6 +97,7 @@
 BuildRequires:	xorg-proto-resourceproto-devel
 BuildRequires:	xorg-proto-scrnsaverproto-devel >= 1.1.0
 BuildRequires:	xorg-proto-trapproto-devel
+BuildRequires:	xorg-proto-videoproto-devel
 BuildRequires:	xorg-proto-xcmiscproto-devel
 BuildRequires:	xorg-proto-xextproto-devel
 BuildRequires:	xorg-proto-xf86bigfontproto-devel
@@ -109,7 +106,6 @@
 BuildRequires:	xorg-proto-xf86vidmodeproto-devel
 BuildRequires:	xorg-proto-xineramaproto-devel
 BuildRequires:	xorg-proto-xproto-devel
-BuildRequires:	xorg-proto-videoproto-devel
 BuildRequires:	xorg-util-util-macros >= 0.99.2
 BuildRequires:	zlib-devel
 Provides:	vnc-client
@@ -211,8 +207,8 @@
 %description utils
 This package contains additional VNC utilities: vncconnect and
 vncpasswd. vncconnect tells Xvnc server to connect to a listening VNC
-viewer. vncpasswd generates password file (both on server and
-viewer side).
+viewer. vncpasswd generates password file (both on server and viewer
+side).
 
 %description utils -l pl.UTF-8
 Ten pakiet zawiera dodatkowe narzędzia VNC: vncconnect i vncpasswd.
@@ -291,7 +287,7 @@
 %{__autoconf}
 %configure \
 	--with-installed-zlib \
-	--with-x 
+	--with-x
 cd ..
 
 cd common
@@ -304,7 +300,7 @@
 cd ..
 
 cd vnc-%{java_vncver}-javasrc/java
-make JAVAC="gcj -C" JAR=jar
+%{__make} JAVAC="gcj -C" JAR=jar
 cd ../..
 
 %{__make} -C unix
@@ -377,7 +373,7 @@
 %attr(755,root,root) %{_bindir}/vncviewer
 %{_mandir}/man1/vncviewer.1*
 %{_desktopdir}/vncviewer.desktop
-%{_datadir}/icons/hicolor/*/apps/vnc.png
+%{_iconsdir}/hicolor/*/apps/vnc.png
 
 %files server
 %defattr(644,root,root,755)
@@ -413,6 +409,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2008-01-08 00:55:40  glen
+- adapter, cleanups
+
 Revision 1.76  2007-11-09 18:18:10  patrys
 - more O: -> C:
 
@@ -459,7 +458,7 @@
 - release 0.1,
 - updated MD5 sum,
 - removed svga and X11 module..
-NFY
+  NFY
 
 Revision 1.63  2006/12/21 17:07:06  witekfl
 - added patches (compilation fixes and the Polish keyboard
@@ -511,7 +510,7 @@
 - Provides : vnc-client
 
 Revision 1.48  2003/09/06 11:48:03  adgor
-- Desktop files moved to %%{_desktopdir}
+- Desktop files moved to %{_desktopdir}
 
 Revision 1.47  2003/09/05 19:00:16  blues
 - nothing
@@ -576,7 +575,7 @@
 - Release 5.
 - Server Requires: xinitrc, vnc-utils, XFree86-fonts-base,
   XFree86-fonts. This sucks, but sitll is true.
-NOTE: In fact it requires some window manager and more.
+  NOTE: In fact it requires some window manager and more.
 
 Revision 1.30  2002/09/28 23:21:00  misiek
 - new urls, note that there is new version of vnc
@@ -597,7 +596,7 @@
 - release 3
 
 Revision 1.27  2002/05/30 23:04:13  qboosh
-- simplified build, new %%doc
+- simplified build, new %doc
 
 Revision 1.26  2002/03/14 17:52:32  misiek
 - link only with system shared zlib; release 2
@@ -624,7 +623,7 @@
 - documentation corrected
 
 Revision 1.19  2001/04/21 06:19:15  kloczek
-- added usibg %%{rpmcflags} macro.
+- added usibg %{rpmcflags} macro.
 
 Revision 1.18  2001/04/20 06:14:57  pascalek
 - %doc fixed
@@ -633,20 +632,20 @@
 - Massive attack. We use -O0 instead -O flags while debug enabled.
 
 Revision 1.16  2000/12/23 00:48:47  michuz
-- changed %%{!?debug:...}%%{?debug...} to %%{?debug:...}%%{!?debug...}
+- changed %{!?debug:...}%{?debug...} to %{?debug:...}%{!?debug...}
   (now it's more C like)
 
 Revision 1.15  2000/10/31 09:25:07  kloczek
 - spec adapterized,
 - added gzipping %doc,
-- make spec %%{debug} ready,
+- make spec %{debug} ready,
 - some other cosmetics.
 
 Revision 1.14  2000/10/30 20:07:37  misiek
 - update, work in progress
 
 Revision 1.13  2000/06/09 07:24:01  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.12  2000/04/01 11:15:56  zagrodzki
 - changed all BuildRoot definitons
@@ -672,41 +671,3 @@
 
 Revision 1.6  1999/07/12 23:06:17  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Thu Feb  4 1999 Ziemek Borowski <ziembor at faq-bot.ziembor.waw.pl>
-  [3.3.2r3-1d]
-- added documentation
-- build angainst glibc 2.1
-- added mode detail %attr in %files section
-- Polish language spec translation
-
-* Sat Nov 7 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
-  [3.3.2r2-1a]
-- Add patch for compiling against LinuxPPC.
-
-* Sat Jul 25 1998 Arne Coucheron <arneco at online.no>
-  [3.3.2r2-1]
-
-* Mon Jul 06 1998 Arne Coucheron <arneco at online.no>
-  [3.3.2-3]
-- it would have been nice if people updating the package would follow
-  common sense and do it so using existing ones, and also update their
-  changes in the changelog, but I guess some find this rule hard to follow
-- binaries moved back to /usr/X11R6/bin
-
-* Tue May 26 1998 Arne Coucheron <arneco at online.no>
-  [3.3.2-1]
-- moved java classes to %{_datadir}/vnc/classes
-- moved binaries to %{_bindir}
-- using predefined %%{name} and %%{version}
-- using %defattr in filelist, this means that rpm 2.5 is required to build
-
-* Tue Mar 17 1998 Arne Coucheron <arneco at online.no>
-  [3.3.1-4]
-- added a new font patch, hopefully this works better (Thanks to Gábor J.Tóth)
-
-* Sun Mar 01 1998 Arne Coucheron <arneco at online.no>
-  [3.3.1-3]
-- using buildroot and %attr macros
-- added patch to make it build against glibc
-- added patch to make it find the fonts on RH5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vnc.spec?r1=1.76&r2=1.77&f=u

More information about the pld-cvs-commit mailing list