Author: pawelz                       Date: Wed Dec 17 00:40:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added x86_64 patch that fixes crashes at %%{x8664} archs (stolen from
  Mandriva). Do not try to merge this patch with imake.patch. These patches
  do not work together.
- removed TODO line.
- removed ExcludeArch: amd64.

---- Files affected:
SPECS:
   tightvnc.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SPECS/tightvnc.spec
diff -u SPECS/tightvnc.spec:1.51 SPECS/tightvnc.spec:1.52
--- SPECS/tightvnc.spec:1.51    Fri Nov  7 21:50:30 2008
+++ SPECS/tightvnc.spec Wed Dec 17 01:40:00 2008
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - tightvnc.init
-# - segfaults on amd64
 Summary:       tightvnc - application based on the VNC version 3.3.3r2
 Summary(pl.UTF-8):     tightvnc - aplikacja bazująca na VNC w wersji 3.3.3r2
 Name:          tightvnc
@@ -14,10 +13,11 @@
 Source1:       %{name}.desktop
 Source2:       %{name}48.png
 Patch0:                %{name}-vncserver.patch
-Patch1:                %{name}-imake.patch
-Patch2:                %{name}-security.patch
-Patch3:                %{name}-imake-tmpdir.patch
-Patch4:                %{name}-xdir.patch
+Patch1:                %{name}-x86_64.patch
+Patch2:                %{name}-imake.patch
+Patch3:                %{name}-security.patch
+Patch4:                %{name}-imake-tmpdir.patch
+Patch5:                %{name}-xdir.patch
 URL:           http://www.tightvnc.com/
 BuildRequires: cpp
 BuildRequires: libjpeg-devel
@@ -31,8 +31,6 @@
 BuildRequires: zlib
 Provides:      vnc-client
 Conflicts:     vnc
-# server proc crashes atm
-ExcludeArch:   amd64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,10 +87,14 @@
 %prep
 %setup -qn vnc_unixsrc
 %patch0 -p1
+%ifarch %{x8664}
 %patch1 -p1
-%patch2 -p2
-%patch3 -p1
+%else
+%patch2 -p1
+%endif
+%patch3 -p2
 %patch4 -p1
+%patch5 -p1
 
 %build
 xmkmf
@@ -159,6 +161,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2008/12/17 00:40:00  pawelz
+- added x86_64 patch that fixes crashes at %%{x8664} archs (stolen from
+  Mandriva). Do not try to merge this patch with imake.patch. These patches
+  do not work together.
+- removed TODO line.
+- removed ExcludeArch: amd64.
+
 Revision 1.51  2008/11/07 20:50:30  arekm
 - release 3
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tightvnc.spec?r1=1.51&r2=1.52&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to