From dde761c70f0e1c5006cbc97a533394b7ccf20bfa Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 26 Nov 2012 13:32:31 +0100 Subject: [PATCH] - update to r5015 - build with -fpic instead of -fPIC on all archs except s390/sparc Signed-off-by: Adam Tkac --- .gitignore | 1 + sources | 2 +- tigervnc.spec | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d4d1669..a2cfaf0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ tigervnc-1.0.90-20100721svn4113.tar.bz2 /tigervnc-1.0.90.tar.gz /tigervnc-1.1.0.tar.gz /tigervnc-1.2.80-20120905svn4996.tar.bz2 +/tigervnc-1.2.80-20121126svn5015.tar.bz2 diff --git a/sources b/sources index f4be844..02274ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff71586fdd126885dd695516a7771720 tigervnc-1.2.80-20120905svn4996.tar.bz2 +147f8d9d49e4a60fe1ba748d051fc43b tigervnc-1.2.80-20121126svn5015.tar.bz2 diff --git a/tigervnc.spec b/tigervnc.spec index b389fc7..3217a67 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,8 +1,8 @@ -%global snap 20120905svn4996 +%global snap 20121126svn5015 Name: tigervnc Version: 1.2.80 -Release: 0.4.%{snap}%{?dist} +Release: 0.5.%{snap}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -139,7 +139,11 @@ popd %patch14 -p1 -b .glx %build +%ifarch sparcv9 sparc64 s390 s390x export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%else +export CFLAGS="$RPM_OPT_FLAGS -fpic" +%endif export CXXFLAGS="$CFLAGS" %{cmake} . @@ -288,6 +292,10 @@ fi %doc LICENCE.TXT %changelog +* Mon Nov 26 2012 Adam Tkac 1.2.80-0.5.20121126svn5015 +- update to r5015 +- build with -fpic instead of -fPIC on all archs except s390/sparc + * Wed Nov 7 2012 Peter Robinson 1.2.80-0.4.20120905svn4996 - Build with -fPIC to fix FTBFS on ARM