rpms/nx/F-7 .cvsignore, 1.9, 1.10 nx.spec, 1.13, 1.14 sources, 1.10, 1.11

Axel Thimm (athimm) fedora-extras-commits at redhat.com
Sat Feb 23 11:05:26 UTC 2008 

Author: athimm

Update of /cvs/extras/rpms/nx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32702/F-7

Modified Files:
	.cvsignore nx.spec sources 
Log Message:
Upgrade to 3.1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Apr 2007 16:01:35 -0000	1.9
+++ .cvsignore	23 Feb 2008 11:04:51 -0000	1.10
@@ -1,9 +1,8 @@
-docs.tar.bz2
-nx-X11-2.1.0-3.tar.gz
-nxagent-2.1.0-18.tar.gz
-nxcomp-2.1.0-7.tar.gz
-nxcompext-2.1.0-5.tar.gz
-nxdesktop-2.1.0-10.tar.gz
-nxproxy-2.1.0-3.tar.gz
-nxscripts-2.1.0-5.tar.gz
-nxviewer-2.1.0-12.tar.gz
+nxagent-3.1.0-2.tar.gz
+nxauth-3.1.0-1.tar.gz
+nxcomp-3.1.0-4.tar.gz
+nxcompext-3.1.0-2.tar.gz
+nxcompshad-3.1.0-2.tar.gz
+nxproxy-3.1.0-2.tar.gz
+nxscripts-3.1.0-1.tar.gz
+nx-X11-3.1.0-1.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/F-7/nx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nx.spec	1 Jun 2007 00:06:23 -0000	1.13
+++ nx.spec	23 Feb 2008 11:04:51 -0000	1.14
@@ -7,25 +7,24 @@
 
 Summary: Proxy system for X11
 Name: nx
-Version: 2.1.0
-Release: 22%{?dist}
+Version: 3.1.0
+Release: 25%{?dist}
 License: GPL, MIT/X11 for X11 bits
 Group: Applications/Internet
 URL: http://www.nomachine.com
 # Compression Libraries and Proxy Sources
-Source0: http://www.nomachine.com/download/%{version}/sources/nxproxy-%{version}-3.tar.gz
-Source1: http://www.nomachine.com/download/%{version}/sources/nxcomp-%{version}-7.tar.gz
-Source2: http://www.nomachine.com/download/%{version}/sources/nxcompext-%{version}-5.tar.gz
+Source0: http://64.34.161.181/download/%{version}/sources/nxproxy-%{version}-2.tar.gz
+Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-4.tar.gz
+Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-2.tar.gz
+# Shadowing Libraries
+Source3: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-2.tar.gz
 # X11 Support Programs and Libraries
-Source3: http://www.nomachine.com/download/%{version}/sources/nx-X11-%{version}-3.tar.gz
+Source4: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-1.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
 # X11 Agent Sources
-Source4: http://www.nomachine.com/download/%{version}/sources/nxagent-%{version}-18.tar.gz
-# RFB Agent Sources
-Source5: http://www.nomachine.com/download/%{version}/sources/nxviewer-%{version}-12.tar.gz
-# RDP Agent Sources
-Source6: http://www.nomachine.com/download/%{version}/sources/nxdesktop-%{version}-10.tar.gz
+Source6: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-2.tar.gz
 # NX Example Scripts
-Source7: http://www.nomachine.com/download/%{version}/sources/nxscripts-%{version}-5.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
 
 Source8: nxwrapper.in
 Source9: docs.tar.bz2
@@ -33,12 +32,7 @@
 Source11: nxfind-provides.sh
 
 %define _use_internal_dependency_generator 0
-%define __find_provides %{SOURCE11}
-
-Patch0: nx-2.1.0-fixes.patch
-Patch1: NX-noansi.diff
-Patch2: p_XFree86-4.3-ppc64.diff
-Patch3: nxagent-64bit-clean.diff
+%define __find_provides sh %{SOURCE11}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -48,30 +42,25 @@
 # Better mention what we really require on a file basis.
 # Requires: xorg-x11-utils
 
-
 %description
 NX provides a proxy system for the X Window System.
 
 %prep
 %setup -q -c %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7
-%patch0 -p0 -b .fixes
-pushd nx-X11
-%patch1 -p0
-%ifarch ppc64
-%patch2 -p1
-%endif
-popd
-%patch3 -p0
-ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1
 export CFLAGS="%{optflags}"
-%ifarch x86_64
-export CFLAGS="$CFLAGS -fPIC"
+%ifarch x86_64 ppc64
+grep -rl -- -fPIC . | xargs perl -pi -e's,-fPIC,-fPIC -DPIC,'
+export CFLAGS="$CFLAGS -fPIC -DPIC"
 %endif
 cat >> nx-X11/config/cf/host.def << EOF
 #ifdef i386Architecture
 #undef DefaultGcc2i386Opt
 #define DefaultGcc2i386Opt $CFLAGS -fno-strict-aliasing
 #endif
+#ifdef AMD64Architecture
+#undef DefaultGcc2AMD64Opt $CFLAGS -fno-strict-aliasing
+#endif
+#define DefaultGcc2AMD64Opt
 #ifdef MipsArchitecture
 #undef DefaultGcc2MipsOpt
 #define DefaultGcc2MipsOpt $CFLAGS -fno-strict-aliasing
@@ -86,36 +75,25 @@
 
 %build
 export CFLAGS="%{optflags}"
-%ifarch x86_64
-export CFLAGS="$CFLAGS -fPIC"
+%ifarch x86_64 ppc64
+export CFLAGS="$CFLAGS -fPIC -DPIC"
 %endif
 export CXXFLAGS="$CFLAGS"
 
 # build Compression Library and Proxy
-for i in nxcomp nxproxy; do
-  pushd $i; ./configure; make CCFLAGS="$CFLAGS"; popd
-done
+#for i in nxcomp nxcompshad nxproxy; do
+#  pushd $i; ./configure; make CCFLAGS="$CFLAGS"; popd
+#done
 # build X11 Support Libraries and Agents
-pushd nx-X11
-  make World
-popd
+make -C nx-X11 World
 # build Extended Compression Library
-pushd nxcompext
-  ./configure; make
-popd
-# build RFB Agent
-pushd nxviewer
-  xmkmf -a
-  cp -a %{_x_libraries}/libXp.so* ../nx-X11/exports/lib/
-  make
+#pushd nxcompext
+#  ./configure; make
+#popd
+pushd nxproxy
+./configure
+make CCFLAGS="$CFLAGS"
 popd
-# build RDP Agent
-%ifnarch ppc ppc64 s390 s390x
-pushd nxdesktop
-  ./configure --prefix=%{_prefix} --sharedir=%{_pkgdatadir}
-  make
-popd
-%endif
 
 %install
 rm -rf %{buildroot}
@@ -141,45 +119,20 @@
 # install Compression Libraries and Proxy
 install -p -m 0755 nxcomp/libXcomp.so.* %{buildroot}%{_pkglibdir}
 install -p -m 0755 nxcompext/libXcompext.so.* %{buildroot}%{_pkglibdir}
+install -p -m 0755 nxcompshad/libXcompshad.so.* %{buildroot}%{_pkglibdir}
 install -p -m 0755 nxproxy/nxproxy %{buildroot}%{_pkglibexecdir}
 ln -s nxwrapper %{buildroot}%{_bindir}/nxproxy
-# install RFB Agent
-pushd nxviewer
-  make install DESTDIR=%{buildroot}
-  mv %{buildroot}%{_x_bindir}/nxviewer %{buildroot}%{_pkglibexecdir}
-  ln -s nxwrapper %{buildroot}%{_bindir}/nxviewer
-  chmod 755 %{buildroot}%{_bindir}/nxviewer
-  if [ "%{_x_bindir}" != "%{_bindir}" ]; then
-    mv %{buildroot}%{_x_bindir}/nxpasswd %{buildroot}%{_bindir}
-  fi
-popd
-# install RDP Agent
-%ifnarch ppc ppc64 s390 s390x
-pushd nxdesktop
-  make install DESTDIR=%{buildroot}
-  mv %{buildroot}%{_bindir}/nxdesktop %{buildroot}%{_pkglibexecdir}
-  ln -s nxwrapper %{buildroot}%{_bindir}/nxdesktop
-  mv %{buildroot}/usr/man/man1/nxdesktop.1 \
-    %{buildroot}%{_mandir}/man1/nxdesktop.1
-  rm -rf %{buildroot}/usr/man
-popd
-%endif
 # install scripts
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 cp -a nxscripts %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 # documentation and license
 tar xjf %{SOURCE9} -C %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 install -m 644 nxcomp/LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-for i in nxcomp nxdesktop; do
+for i in nxcomp; do
   mkdir %{buildroot}%{_defaultdocdir}/%{name}-%{version}/$i
 done
 install -p -m 0644 nxcomp/README \
   %{buildroot}%{_defaultdocdir}/%{name}-%{version}/nxcomp/
-install -p -m 0644 nxdesktop/README \
-  %{buildroot}%{_defaultdocdir}/%{name}-%{version}/nxdesktop/
-rm -rf nxdesktop/doc/CVS
-cp -ar nxdesktop/doc/* \
-  %{buildroot}%{_defaultdocdir}/%{name}-%{version}/nxdesktop/
 
 %clean
 rm -rf %{buildroot}
@@ -190,12 +143,14 @@
 %{_bindir}/*
 %{_pkglibdir}
 %{_pkglibexecdir}
-%ifnarch ppc ppc64 s390 s390x
-%{_pkgdatadir}
-%{_mandir}/man1/nxdesktop.1.gz
-%endif
 
 %changelog
+* Wed Jan  2 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.1.0-25
+- Update to 3.1.0.
+- add nxcompshad, nxauth; remove nxviewer, nxdesktop.
+- add -fPIC for ppc64.
+- Propagate %%{optflags} for x86_64, too.
+
 * Fri Jun  1 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1.0-22
 - Sync with ATrpms' nxfindprovides helper.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 May 2007 13:09:24 -0000	1.10
+++ sources	23 Feb 2008 11:04:51 -0000	1.11
@@ -1,10 +1,10 @@
+e14977404b8abeb5de137bf16bf234a2  nxagent-3.1.0-2.tar.gz
+75ee1a4140322645fcd2a8303cd306c7  nxauth-3.1.0-1.tar.gz
+83b1d33085b04b338ec46f0c86ed5c1e  nxcomp-3.1.0-4.tar.gz
+746c2a65978a622d301eb2c5bea0b94c  nxcompext-3.1.0-2.tar.gz
+167af862593a494237a1a0b4adbbb600  nxcompshad-3.1.0-2.tar.gz
+6e2abffa850d89586c8df922e2f218bd  nxproxy-3.1.0-2.tar.gz
+8a059c0c188fe5618955086730d11460  nxscripts-3.1.0-1.tar.gz
+e3abbf75152037ac02b61bf991a2dfcc  nx-X11-3.1.0-1.tar.gz
 0511072ee377316879bb91a75153ed47  docs.tar.bz2
-9c6e9e4c35c4ec3a7664fcdd397eb7f0  nx-X11-2.1.0-3.tar.gz
-cae6005f50bab78aa7abba448fca4ed9  nxagent-2.1.0-18.tar.gz
-52b0e108004ec14c51b44b61b66f70e8  nxcomp-2.1.0-7.tar.gz
-d3347382860670cfd4471d228fb1b730  nxcompext-2.1.0-5.tar.gz
-f96395297324ffe249fdec3065d754be  nxdesktop-2.1.0-10.tar.gz
-29b0e8be069a8258f5b8774362fc7464  nxproxy-2.1.0-3.tar.gz
-0fa857d3291f6b89f799531f028011e7  nxscripts-2.1.0-5.tar.gz
-e9f5b692278025856b09bd71d0966100  nxviewer-2.1.0-12.tar.gz
 477190c6f366dfe2f5ce76978e52238a  nxfind-provides.sh

More information about the fedora-extras-commits mailing list