Merge branch 'master' of https://github.com/BojanCendio/tigervnc
diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index 72bd4a5..08fff0b 100644
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -127,6 +127,7 @@
 BuildRequires: xz
 %if !%{_bootstrap}
 BuildRequires: %{name}-static-devel == %{version}
+BuildRequires: nasm >= 2.01
 %endif
 
 Requires(post): initscripts chkconfig coreutils
@@ -457,7 +458,7 @@
 %build
 export CC=gcc44
 export CXX=g++44
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="-g $RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$CFLAGS -static-libgcc"
 export PYTHON=python26