Author: aredridel Date: Mon Sep 11 18:49:09 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.0
---- Files affected: SPECS: nx.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/nx.spec diff -u SPECS/nx.spec:1.14 SPECS/nx.spec:1.15 --- SPECS/nx.spec:1.14 Sun May 21 14:46:43 2006 +++ SPECS/nx.spec Mon Sep 11 20:49:04 2006 @@ -2,43 +2,38 @@ # TODO: # - build packages from separate specs where possible # - use optflags where missing -%define _agent_minor 112 -%define _auth_minor 1 -%define _compext_minor 20 -%define _comp_minor 80 -%define _desktop_minor 78 +%define _agent_minor 93 +%define _auth_minor 3 +%define _desktop_minor 50 %define _viewer_minor 15 -%define _proxy_minor 9 -%define _X11_minor 21 +%define _proxy_minor 2 +%define _X11_minor 31 Summary: NoMachine NX is the next-generation X compression scheme Summary(pl): NoMachine NX to schemat kompresji nowej generacji dla X Name: nx -Version: 1.5.0 +Version: 2.0.0 Release: 2 License: GPL Group: Libraries #SourceDownload: http://www.nomachine.com/download/snapshot/nxsources/ Source0: http://web04.nomachine.com/download/%{version}/sources/%{name}-X11-%{version}-%{_X11_minor}.tar.gz -# Source0-md5: 11877c3357732a957e3bf7e3d2f2ca0a +# Source0-md5: 0c63cfdc37658eb74f4a84077b05fe9e Source1: http://web04.nomachine.com/download/%{version}/sources/%{name}agent-%{version}-%{_agent_minor}.tar.gz -# Source1-md5: 160726ed67698a9694b707950c49e19e +# Source1-md5: d08f5872a88902ccecd17312e4255aab Source2: http://web04.nomachine.com/download/%{version}/sources/%{name}auth-%{version}-%{_auth_minor}.tar.gz -# Source2-md5: a7c5e68e9678cb5c722c334b33baf660 -Source3: http://web04.nomachine.com/download/%{version}/sources/%{name}compext-%{version}-%{_compext_minor}.tar.gz -# Source3-md5: 6a5b8b79b9e0cc81b88233b18c4f227f +# Source2-md5: 8385751f7ab9c6407a56e95356030ba4 Source4: http://web04.nomachine.com/download/%{version}/sources/%{name}desktop-%{version}-%{_desktop_minor}.tar.gz -# Source4-md5: 6c20c1300ca6b4d362237ef44cfee7f7 +# Source4-md5: f55dc97544a061dfa0f099329dcc3f53 Source5: http://web04.nomachine.com/download/%{version}/sources/%{name}viewer-%{version}-%{_viewer_minor}.tar.gz -# Source5-md5: ff3e5a4c1601b58f5fc405f990691bdf -Source6: http://web04.nomachine.com/download/%{version}/sources/%{name}comp-%{version}-%{_comp_minor}.tar.gz -# Source6-md5: 782f04870142c9fc5b2e1f654fd0a5d7 +# Source5-md5: 0e4b1d546b4b8a0224cd0d200ec88827 Source7: http://web04.nomachine.com/download/%{version}/sources/%{name}proxy-%{version}-%{_proxy_minor}.tar.gz -# Source7-md5: d2e3c1a109db336dfa497f4c2004f2d5 +# Source7-md5: b078c19372c82e85667cbbac880fa688 Patch0: %{name}-X11-libs.patch Patch1: %{name}compext-libs.patch Patch2: %{name}viewer.patch Patch3: %{name}-gcc-4.1.patch Patch4: %{name}-fonts.patch +Patch5: %{name}-system-nxcomp.patch URL: http://www.nomachine.com/ #BuildRequires: Xaw3d-devel BuildRequires: autoconf @@ -49,6 +44,8 @@ BuildRequires: openssl-devel BuildRequires: sed >= 4.0 BuildRequires: which +BuildRequires: nxcomp-devel >= 2.0.0 +BuildRequires: nxcompext-devel >= 2.0.0 BuildRequires: xorg-cf-files BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXt-devel @@ -66,31 +63,20 @@ zdalnych sesjach X11 nawet przy prędkosci 56k albo większej. %prep -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -%patch0 +%setup -q -c -a1 -a2 -a4 -a5 -a7 +%patch0 -p1 #%patch1 -%patch2 +%patch2 -p1 %patch3 -p1 %patch4 -p0 +%patch5 -p1 %build export CFLAGS="%{rpmcflags} -fPIC" export CXXFLAGS="%{rpmcflags} -fPIC" export CPPFLAGS="%{rpmcflags} -fPIC" -cd nxcomp -%configure -%{__make} \ - CC="%{__cc}" - -cd ../nxcompext -%configure -sed -i -e "s|LDFLAGS = |LDFLAGS = -fPIC |" Makefile -%{__make} \ - CC="%{__cc}" \ - MAKEDEPEND=/bin/true - -cd ../nx-X11 +cd nx-X11 %{__make} \ CC="%{__cc}" \ World @@ -122,10 +108,6 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_libdir}/pkgconfig,%{_bindir},%{_includedir}/nxcompsh} -# comp -install nxcomp/libXcomp.so.* $RPM_BUILD_ROOT%{_libdir} -rm -f $RPM_BUILD_ROOT%{_libdir}/libXcomp.so.1 - # X11 install nx-X11/lib/X11/libX11-nx.so.* \ nx-X11/lib/Xext/libXext-nx.so.* \ @@ -137,10 +119,6 @@ # desktop install nxdesktop/nxdesktop $RPM_BUILD_ROOT%{_bindir} -# compext -install nxcompext/libXcompext.so.* $RPM_BUILD_ROOT%{_libdir} -rm -f $RPM_BUILD_ROOT%{_libdir}/libXcompext.so.1 - # viewer install nxviewer/nxviewer/nxviewer $RPM_BUILD_ROOT%{_bindir} install nxviewer/nxpasswd/nxpasswd $RPM_BUILD_ROOT%{_bindir} @@ -165,6 +143,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2006/09/11 18:49:04 aredridel +- 2.0.0 + Revision 1.14 2006/05/21 12:46:43 arekm - rel 2; fix font path ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
