diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2015-03-14 18:06:14 -0400 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2015-03-14 23:14:30 -0400 |
| commit | 22507ca92574df2febd95326aa7f893f16874f25 (patch) | |
| tree | f7340fb1c65c8c764a9a13cfb70c6929eb9a9492 /contrib/packages/rpm/el6 | |
| parent | d1cb31f43636e574058f64ac3e5e4cbe20f162b4 (diff) | |
| download | tigervnc-22507ca92574df2febd95326aa7f893f16874f25.tar.gz tigervnc-22507ca92574df2febd95326aa7f893f16874f25.zip | |
Update package builds to meet new minimum requirements.
el5 and el6 need newer versions of gnutls (and it's prereqs) than are available natively.
Diffstat (limited to 'contrib/packages/rpm/el6')
| -rw-r--r-- | contrib/packages/rpm/el6/SPECS/tigervnc.spec | 123 |
1 files changed, 108 insertions, 15 deletions
diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec index dd0fb09e..d0e65578 100644 --- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec @@ -2,7 +2,7 @@ Name: tigervnc Version: @VERSION@ -Release: 20%{?snap:.%{snap}}%{?dist} +Release: 21%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -15,6 +15,11 @@ Source1: vncserver.service Source2: vncserver.sysconfig Source6: vncviewer.desktop Source11: http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz +Source13: http://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.10/libpng-1.5.10.tar.bz2 +Source14: https://ftp.gnu.org/gnu/gmp/gmp-6.0.0a.tar.bz2 +Source15: http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.2.tar.gz +Source16: https://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz +Source17: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.13.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-devel @@ -25,7 +30,7 @@ BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel BuildRequires: mesa-libGL-devel, libXinerama-devel, ImageMagick BuildRequires: freetype-devel, libXdmcp-devel BuildRequires: desktop-file-utils, java-devel, jpackage-utils -BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel +BuildRequires: libjpeg-turbo-devel, pam-devel BuildRequires: cmake28 %ifnarch s390 s390x BuildRequires: xorg-x11-server-devel @@ -142,6 +147,11 @@ This package contains icons for TigerVNC viewer %patch11 -p1 -b .gethomedir tar xzf %SOURCE11 +tar xjf %SOURCE13 +tar xjf %SOURCE14 +tar xzf %SOURCE15 +tar xzf %SOURCE16 +xzcat %SOURCE17 | tar xf - cp -r /usr/share/xorg-x11-server-source/* unix/xserver pushd unix/xserver @@ -156,31 +166,111 @@ popd %build %define tigervnc_src_dir %{_builddir}/%{name}-%{version}%{?snap:-%{snap}} %define static_lib_buildroot %{tigervnc_src_dir}/build +mkdir -p %{static_lib_buildroot}%{_libdir} + %ifarch sparcv9 sparc64 s390 s390x -export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{static_lib_buildroot}%{_includedir}" %else -export CFLAGS="$RPM_OPT_FLAGS -fpic" +export CFLAGS="$RPM_OPT_FLAGS -fpic -I%{static_lib_buildroot}%{_includedir}" %endif -export CXXFLAGS="$CFLAGS" +export CXXFLAGS=$CFLAGS +export CPPFLAGS=$CXXFLAGS +export PKG_CONFIG_PATH="%{static_lib_buildroot}%{_libdir}/pkgconfig:%{static_lib_buildroot}%{_datadir}/pkgconfig:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig" + +echo "*** Building gmp ***" +pushd gmp-* +./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-static --disable-shared --enable-cxx --disable-assembly +make %{?_smp_mflags} DESTDIR=%{static_lib_buildroot} install +find %{static_lib_buildroot}%{_prefix} -type f -name "*.la" -delete +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{static_lib_buildroot}%{_libdir}|" {} \; +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{static_lib_buildroot}%{_prefix}|" {} \; +popd + +echo "*** Building libtasn1 ***" +pushd libtasn1-* +LDFLAGS="-L%{static_lib_buildroot}%{_libdir} $LDFLAGS" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-static --disable-shared +make %{?_smp_mflags} DESTDIR=%{static_lib_buildroot} install +find %{static_lib_buildroot}%{_prefix} -type f -name "*.la" -delete +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{static_lib_buildroot}%{_libdir}|" {} \; +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{static_lib_buildroot}%{_prefix}|" {} \; +popd + +echo "*** Building nettle ***" +pushd nettle-* +autoreconf -fiv +LDFLAGS="-L%{static_lib_buildroot}%{_libdir} -Wl,-Bstatic -ltasn1 -lgmp -Wl,-Bdynamic $LDFLAGS" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-static --disable-shared --disable-openssl +make %{?_smp_mflags} DESTDIR=%{static_lib_buildroot} install +find %{static_lib_buildroot}%{_prefix} -type f -name "*.la" -delete +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{static_lib_buildroot}%{_libdir}|" {} \; +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{static_lib_buildroot}%{_prefix}|" {} \; +popd + +echo "*** Building gnutls ***" +pushd gnutls-* +LDFLAGS="-L%{static_lib_buildroot}%{_libdir} -Wl,-Bstatic -lnettle -lhogweed -ltasn1 -lgmp -Wl,-Bdynamic $LDFLAGS" ./configure \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --enable-static \ + --disable-shared \ + --without-p11-kit \ + --disable-guile \ + --disable-srp-authentication \ + --disable-libdane \ + --disable-doc \ + --enable-local-libopts \ + --without-tpm \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --disable-heartbeat-support +make %{?_smp_mflags} DESTDIR=%{static_lib_buildroot} install +find %{static_lib_buildroot}%{_prefix} -type f -name "*.la" -delete +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{static_lib_buildroot}%{_libdir}|" {} \; +find %{static_lib_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{static_lib_buildroot}%{_prefix}|" {} \; +popd + +echo "*** Building libpng ***" +pushd libpng-* +CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" ./configure \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --disable-shared \ + --enable-static +make %{?_smp_mflags} +make DESTDIR=%{static_lib_buildroot} install +popd echo "*** Building fltk ***" pushd fltk-* -%{cmake28} -G"Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPTION_PREFIX_LIB=%{_libdir} \ - -DOPTION_PREFIX_CONFIG=%{_libdir} \ - -DOPTION_BUILD_EXAMPLES=off \ - -DOPTION_USE_SYSTEM_LIBPNG=on +export CMAKE_PREFIX_PATH="%{static_lib_buildroot}%{_prefix}:%{_prefix}" +export CMAKE_EXE_LINKER_FLAGS=$LDFLAGS +export PKG_CONFIG="pkg-config --static" +CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="-L%{static_lib_buildroot}%{_libdir} -Wl,-Bstatic -lpng -Wl,-Bdynamic $LDFLAGS" ./configure \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --enable-x11 \ + --enable-gl \ + --disable-shared \ + --enable-localjpeg \ + --enable-localzlib \ + --disable-localpng \ + --enable-xinerama \ + --enable-xft \ + --enable-xdbe \ + --enable-xfixes \ + --enable-xcursor \ + --with-x make %{?_smp_mflags} +make DESTDIR=%{static_lib_buildroot} install popd %{cmake28} -G"Unix Makefiles" \ -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.3/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.3/lib/libfltk_images.a;-lpng" \ - -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.3 -make LDFLAGS="-lpng" %{?_smp_mflags} + -DFLTK_LIBRARIES="%{static_lib_buildroot}%{_libdir}/libfltk.a;%{static_lib_buildroot}%{_libdir}/libfltk_images.a;%{static_lib_buildroot}%{_libdir}/libpng.a" \ + -DFLTK_INCLUDE_DIR=%{static_lib_buildroot}%{_includedir} \ + -DGNUTLS_INCLUDE_DIR=%{static_lib_buildroot}%{_includedir} \ + -DGNUTLS_LIBRARY="%{static_lib_buildroot}%{_libdir}/libgnutls.a;%{static_lib_buildroot}%{_libdir}/libtasn1.a;%{static_lib_buildroot}%{_libdir}/libnettle.a;%{static_lib_buildroot}%{_libdir}/libhogweed.a;%{static_lib_buildroot}%{_libdir}/libgmp.a" +make %{?_smp_mflags} pushd unix/xserver autoreconf -fiv @@ -336,6 +426,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Mar 14 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.80-21 +- Build static libraries to meet new minimum requirements + * Sat Mar 07 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.80-20 - Don't disable xinerama extension |