From 1497bdd218cc5df2291c204da9ac208eab75cf20 Mon Sep 17 00:00:00 2001 From: Brian P. Hinz Date: Oct 20 2012 17:31:27 +0000 Subject: Need to build temporary cmake 2.8 in order to meet tigervnc build requirements --- diff --git a/.gitignore b/.gitignore index 0603691..e71bbfc 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ tigervnc-1.0.90-20100721svn4113.tar.bz2 /xorg-server-1.7.1.tar.bz2 /xproto-7.0.16.tar.bz2 /xtrans-1.2.5.tar.bz2 +/cmake-2.8.9.tar.gz diff --git a/sources b/sources index 29f2644..9ad22f2 100644 --- a/sources +++ b/sources @@ -1,67 +1 @@ -7db4617e9e10ad3aca1b64339fd71b7d MesaLib-7.6.1.tar.bz2 -d30c5dbf19ca6dffcd9788227ecff8c5 bigreqsproto-1.1.0.tar.bz2 -3692f3f8b2ea10dff3d2cede8dc65e79 compositeproto-0.4.1.tar.bz2 -434b931b02bd83ed9fc44951df81cdac damageproto-1.2.0.tar.bz2 -5cb7987d29db068153bdc8f23c767c43 dri2proto-2.1.tar.bz2 -4c1cb4f2ed9f34de59f2f04783ca9483 fixesproto-4.1.1.tar.bz2 -d3916d2a49e7590f7d0f2241cdc55440 fltk-1.3.0r9619.tar.bz2 -f3a857deadca3144fba041af1dbf7603 fontsproto-2.1.0.tar.bz2 -13286702e9390a91661f980608adaff1 freetype-2.4.10.tar.bz2 -c9f8cebfba72bfab674bc0170551fb8d glproto-1.4.10.tar.bz2 -0f7acbc14a082f9ae03744396527d23d inputproto-2.0.tar.bz2 -7f439166a9b2bf81471a33951883019f kbproto-1.0.4.tar.bz2 -2d39bc924af24325dae589e9a849180c libICE-1.0.6.tar.bz2 -6889a455496aaaa65b1fa05fc518d179 libSM-1.1.1.tar.bz2 -001d780829f936e34851ef7cd37b4dfd libX11-1.3.2.tar.bz2 -33e54f64b55f22d8bbe822a5b62568cb libXScrnSaver-1.2.0.tar.bz2 -993b3185c629e4b89401fca072dcb663 libXau-1.0.5.tar.bz2 -815e74de989ccda684e2baf8d12cf519 libXaw-1.0.7.tar.bz2 -0f1367f57fdf5df17a8dd71d0fa68248 libXcomposite-0.4.1.tar.bz2 -7dcdad1c10daea872cb3355af414b2ca libXcursor-1.1.10.tar.bz2 -b42780bce703ec202a33e5693991c09d libXdamage-1.1.2.tar.bz2 -d60941d471800f41a3f19b24bea855a7 libXdmcp-1.0.3.tar.bz2 -c417c0e8df39a067f90a2a2e7133637d libXext-1.1.1.tar.bz2 -7f2c40852eb337b237ad944ca5c30d49 libXfixes-4.0.4.tar.bz2 -4f2bed2a2be82e90a51a24bb3a22cdf0 libXfont-1.4.1.tar.bz2 -254e62a233491e0e1251636536163e20 libXft-2.1.14.tar.bz2 -8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 -a2ac01fc0426cdbb713c5d59cf9955ed libXinerama-1.1.tar.bz2 -fc4d66be7a1a1eb474954728415e46d6 libXmu-1.0.5.tar.bz2 -38e58e72d476a74298a59052fde185a3 libXpm-3.5.8.tar.bz2 -68eb59c3b7524db6ffd78746ee893d1d libXrandr-1.3.0.tar.bz2 -276dd9e85daf0680616cd9f132b354c9 libXrender-0.9.5.tar.bz2 -4daf91f93d924e693f6f6ed276791be2 libXres-1.0.4.tar.bz2 -96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 -dd6f3e20b87310187121539f9605d977 libXtst-1.1.0.tar.bz2 -1d97798b1d8bbf8d9085e1b223a0738f libXv-1.0.5.tar.bz2 -16c3a11add14979beb7510e44623cac6 libXvMC-1.0.5.tar.bz2 -368837d3d7a4d3b4f70be48383e3544e libXxf86dga-1.1.1.tar.bz2 -b431ad7084e1055fef99a9115237edd8 libXxf86vm-1.1.0.tar.bz2 -a40f5293dc0a7b49d2a1e959d7d60194 libdrm-2.4.35.tar.bz2 -4f0d8191819be9f2bdf9dad49a65e43b libfontenc-1.0.5.tar.bz2 -f61e60ff01381ece4d2fe65eeb52669e libjpeg-turbo-1.2.1.tar.gz -685cb20e7a6165bc010972f1183addbd libpciaccess-0.10.9.tar.bz2 -d87f9c34ccab8242c00e41925839f6c9 libpng-1.5.12.tar.bz2 -e8fa31b42e13f87e8f5a7a2b731db7ee libpthread-stubs-0.3.tar.bz2 -b01156e263eca8177e6b7f10441951c4 libxkbfile-1.0.6.tar.bz2 -be41339158138ce4c13ca79756c351a3 pixman-0.26.0.tar.gz -a5c244c36382b0de39b2828cea4b651d randrproto-1.3.1.tar.bz2 -70f5998c673aa510e2acd6d8fb3799de recordproto-1.14.tar.bz2 -b160a9733fe91b666e74fca284333148 renderproto-0.11.tar.bz2 -84795594b3ebd2ee2570cf93340d152c resourceproto-1.1.0.tar.bz2 -9040c991a56ee9b5976936f8c65d5c8a scrnsaverproto-1.2.0.tar.bz2 -da11c4d9b84d24ca3872f2cada411739 tigervnc-1.2.0-20120915svn4999.tar.bz2 -0837fe88af7d692308b25815457a3288 util-macros-1.3.0.tar.bz2 -fb762146a18207a1e8bc9f299dfc7ac0 videoproto-2.3.0.tar.bz2 -fa00078c414c4a57cab7a6d89a0c8734 xauth-1.0.4.tar.bz2 -7b83e4a7e9f4edc9c6cfb0500f4a7196 xcmiscproto-1.2.0.tar.bz2 -fb6ccaae76db7a35e49b12aea60ca6ff xextproto-7.1.1.tar.bz2 -120e226ede5a4687b25dd357cc9b8efe xf86bigfontproto-1.2.0.tar.bz2 -a036dc2fcbf052ec10621fd48b68dbb1 xf86dgaproto-2.1.tar.bz2 -309d552732666c3333d7dc63e80d042f xf86driproto-2.1.0.tar.bz2 -4434894fc7d4eeb4a22e6b876d56fdaa xf86vidmodeproto-2.3.tar.bz2 -a8aadcb281b9c11a91303e24cdea45f5 xineramaproto-1.2.tar.bz2 -369a21641b7ca983d6641298e51d97f8 xkbutils-1.0.2.tar.bz2 -dda7842467cda6018fdc87e6002e4db1 xorg-server-1.7.1.tar.bz2 -75c9edff1f3823e5ab6bb9e66821a901 xproto-7.0.16.tar.bz2 -2d1e57e82acc5f21797e92341415af2f xtrans-1.2.5.tar.bz2 +801f4c87f8b604f727df5bf1f05a59e7 cmake-2.8.9.tar.gz diff --git a/tigervnc.spec b/tigervnc.spec index 493db40..b8ed56f 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -3,7 +3,7 @@ Name: tigervnc Version: 1.2.0 -Release: 6.%{snap}%{?dist} +Release: 7.%{snap}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -16,6 +16,7 @@ Source2: vncserver.sysconfig Source6: vncviewer.desktop Source11: fltk-1.3.0r9619.tar.bz2 Source12: http://downloads.sourceforge.net/project/libjpeg-turbo/1.2.1/libjpeg-turbo-1.2.1.tar.gz +Source13: http://www.cmake.org/files/v2.8/cmake-2.8.9.tar.gz Source98: http://www.x.org/releases/X11R7.5/src/proto/xineramaproto-1.2.tar.bz2 Source99: http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 @@ -96,7 +97,6 @@ BuildRequires: automake >= 1.7, autoconf >= 2.57, libtool >= 1.4, gettext >= 0.1 BuildRequires: openssl-devel, inkscape BuildRequires: desktop-file-utils, java-devel, jpackage-utils BuildRequires: gnutls-devel, pam-devel -BuildRequires: cmake >= 2.8 BuildRequires: pkgconfig >= 0.20 Requires: openmotif-devel, openmotif, openmotif22 @@ -242,6 +242,13 @@ rm -rf %{_topdir}/BUILD/%{name}-%{version}-%{snap} %patch13 -p1 -b .rh692048 %patch105 -p1 -b .use-inkscape +tar xzf %SOURCE13 +pushd cmake-* +./configure +make +%define cmake %{_topdir}/BUILD/%{name}-%{version}-%{snap}/cmake-2.8.9/bin/cmake +popd + tar xjf %SOURCE11 pushd fltk-* %patch110 -p1 -b .hwheel @@ -369,7 +376,7 @@ echo "*** Building fltk ***" pushd fltk-* export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" -cmake -G"Unix Makefiles" \ +%{cmake} -G"Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DOPTION_PREFIX_LIB=%{_libdir} \ -DOPTION_PREFIX_CONFIG=%{_libdir} \ @@ -723,6 +730,10 @@ fi %doc LICENCE.TXT %changelog +* Sat Oct 20 2012 Brian P. Hinz 1.2.0-7.20120915svn4999 +- Build a temporary cmake 2.8 in order to meet tigervnc requirements for + building. + * Tue Sep 18 2012 Brian P. Hinz 1.2.0-6.20120915svn4999 - Applied icon support patch