diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-03-12 11:15:32 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-03-12 11:15:32 +0100 |
| commit | d1cb31f43636e574058f64ac3e5e4cbe20f162b4 (patch) | |
| tree | 1260ce593ca99b9fe22eb51b906f54b2c0f567fe /contrib/packages/rpm | |
| parent | 59b4bc5638ced3cb5f043ccd9ed207fe76148d1a (diff) | |
| parent | 4cf2d3a621ecb9918b57021bc1cee1bd016dc0aa (diff) | |
| download | tigervnc-d1cb31f43636e574058f64ac3e5e4cbe20f162b4.tar.gz tigervnc-d1cb31f43636e574058f64ac3e5e4cbe20f162b4.zip | |
Merge branch 'upreqs' of https://github.com/CendioOssman/tigervnc
Conflicts:
contrib/packages/rpm/el5/SPECS/tigervnc.spec
vncviewer/Viewport.cxx
Diffstat (limited to 'contrib/packages/rpm')
| -rw-r--r-- | contrib/packages/rpm/el5/SPECS/tigervnc.spec | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec index 4bf12620..93c2a78a 100644 --- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec @@ -741,7 +741,6 @@ export CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -c //g'` -DFLTK_INCLUDE_DIR=%{xorg_buildroot}%{_includedir} \ -DBUILD_STATIC=1 \ -DCMAKE_BUILD_TYPE=Release \ - -DUSE_INCLUDED_ZLIB=0 \ -DZLIB_INCLUDE_DIR=%{_includedir} \ -DZLIB_LIBRARY=%{_libdir}/libz.a \ -DCMAKE_INSTALL_PREFIX=%{_prefix} |