[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/nx/FC-6 nx.spec,1.7,1.8 sources,1.8,1.9



Author: athimm

Update of /cvs/extras/rpms/nx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4616/FC-6

Modified Files:
	nx.spec sources 
Log Message:
Backport to fc6/fc5.


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-6/nx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nx.spec	29 Sep 2006 17:26:18 -0000	1.7
+++ nx.spec	19 May 2007 11:28:21 -0000	1.8
@@ -1,77 +1,94 @@
-Name:           nx
-Version:        2.1.0
-Release:        1%{?dist}
-Summary:        Proxy system for X11
-
-Group:          Applications/Internet
-License:        GPL, MIT/X11 for X11 bits
-URL:            http://www.nomachine.com
-Source0:	nxproxy-%{version}-2.tar.gz
-Source1:	nxcomp-%{version}-3.tar.gz
-Source2:	nxcompext-%{version}-3.tar.gz
-Source3:	nx-X11-%{version}-2.tar.gz
-Source4:	nxagent-%{version}-9.tar.gz
-Source5:	nxviewer-%{version}-4.tar.gz
-Source6:	nxdesktop-%{version}-3.tar.gz
-Source7:	nxscripts-%{version}-1.tar.gz
-Source8:	nxssh-%{version}-1.tar.gz
-Source9:	nxagent
-Source10:	docs.tar.bz2
-Source11:	nxfind-provides.sh
-Patch0:		NX.diff
-Patch1:		NX-noansi.diff
-Patch2:		p_XFree86-4.3-ppc64.diff
-Patch5:		NX-bufferoverflow.diff
-Patch6:		NX-data-range.patch
-Patch7:		ppc-no-signed-char.diff
-
-%define _use_internal_dependency_generator 0
-%define __find_provides %{SOURCE11}
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  expat-devel audiofile-devel openssl-devel libjpeg-devel libpng-devel libX11-devel libXp-devel imake
-Requires:	xorg-x11-server-Xorg xorg-x11-apps xorg-x11-utils
-Requires(post): policycoreutils
-Requires(postun): policycoreutils
-Excludearch:	x86_64
+%define _x_libraries %{_libdir}
+%define _x_bindir %{_bindir}
+
+%define _pkglibdir %{_libdir}/nx
+%define _pkgdatadir %{_datadir}/nx
+%define _pkglibexecdir %{_libexecdir}/nx
+
+Summary: Proxy system for X11
+Name: nx
+Version: 2.1.0
+Release: 19%{?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
+# X11 Support Programs and Libraries
+Source3: http://www.nomachine.com/download/%{version}/sources/nx-X11-%{version}-3.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
+# NX Example Scripts
+Source7: http://www.nomachine.com/download/%{version}/sources/nxscripts-%{version}-5.tar.gz
+
+Source8: nxwrapper.in
+Source9: docs.tar.bz2
+
+Patch0: nx-2.1.0-fixes.patch
+Patch1: NX-noansi.diff
+Patch2: p_XFree86-4.3-ppc64.diff
+Patch3: nxagent-64bit-clean.diff
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++, redhat-release
+BuildRequires: expat-devel, audiofile-devel, openssl-devel, libjpeg-devel, libpng-devel
+BuildRequires: libXt-devel, xorg-x11-proto-devel, libXp-devel, imake
+# 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 -T -c %{name}-%{version} -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
-%patch0 -p0
+%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
-%patch5 -p0
-%patch6 -p1
-%patch7 -p0
+%patch3 -p0
 ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1
+export CFLAGS="%{optflags}"
+%ifarch x86_64
+export CFLAGS="$CFLAGS -fPIC"
+%endif
 cat >> nx-X11/config/cf/host.def << EOF
-#ifdef  i386Architecture
-#undef  DefaultGcc2i386Opt
-#define DefaultGcc2i386Opt      $RPM_OPT_FLAGS -fno-strict-aliasing
+#ifdef i386Architecture
+#undef DefaultGcc2i386Opt
+#define DefaultGcc2i386Opt $CFLAGS -fno-strict-aliasing
 #endif
-#ifdef  MipsArchitecture
-#undef  DefaultGcc2MipsOpt
-#define DefaultGcc2MipsOpt      $RPM_OPT_FLAGS -fno-strict-aliasing
+#ifdef MipsArchitecture
+#undef DefaultGcc2MipsOpt
+#define DefaultGcc2MipsOpt $CFLAGS -fno-strict-aliasing
 #endif
 #ifdef s390xArchitecture
 #undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags $RPM_OPT_FLAGS -fno-strict-aliasing
+#define OptimizedCDebugFlags $CFLAGS -fno-strict-aliasing
 #endif
 EOF
+export CXXFLAGS="$CFLAGS"
+perl -pi -e"s|CXXFLAGS=.-O.*|CXXFLAGS=\"$CXXFLAGS\"|" */configure
 
 %build
 export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-perl -pi -e"s|CXXFLAGS=.-O.*|CXXFLAGS=\"$CXXFLAGS\"|" */configure
+%ifarch x86_64
+export CFLAGS="$CFLAGS -fPIC"
+%endif
+export CXXFLAGS="$CFLAGS"
+
 # build Compression Library and Proxy
 for i in nxcomp nxproxy; do
-  pushd $i; ./configure; make; popd
+  pushd $i; ./configure; make CCFLAGS="$CFLAGS"; popd
 done
 # build X11 Support Libraries and Agents
 pushd nx-X11
@@ -81,177 +98,121 @@
 pushd nxcompext
   ./configure; make
 popd
-# build nxssh
-pushd nxssh
-  ./configure; make
-popd
 # build RFB Agent
 pushd nxviewer
   xmkmf -a
-  cp -a %{_libdir}/libXp.so* ../nx-X11/exports/lib/
-  make 2> /dev/null
+  cp -a %{_x_libraries}/libXp.so* ../nx-X11/exports/lib/
+  make
 popd
 # build RDP Agent
 %ifnarch ppc ppc64 s390 s390x
 pushd nxdesktop
-  ./configure --prefix=%{_prefix} --sharedir=%{_datadir}/NX
+  ./configure --prefix=%{_prefix} --sharedir=%{_pkgdatadir}
   make
 popd
 %endif
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_libdir}/NX/lib
-mkdir -p %{buildroot}/%{_mandir}/man1
+
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_pkglibdir}
+mkdir -p %{buildroot}%{_pkglibexecdir}
+mkdir -p %{buildroot}%{_mandir}/man1
+
 # install X11 Support Libraries and Agents
-cp -a nx-X11/lib/X11/libX11.so.* \
-      nx-X11/lib/Xext/libXext.so.* \
-      nx-X11/lib/Xrender/libXrender.so.* \
-      %{buildroot}/%{_libdir}/NX/lib
-install -m 755 nx-X11/programs/Xserver/nxagent \
-  %{buildroot}/%{_libdir}/NX
-install -m 755 %{SOURCE9} %{buildroot}/%{_bindir}
+install -p -m 0755 nx-X11/lib/X11/libX11.so.* \
+   nx-X11/lib/Xext/libXext.so.* \
+   nx-X11/lib/Xrender/libXrender.so.* \
+   %{buildroot}%{_pkglibdir}
+install -p -m 0755 nx-X11/programs/Xserver/nxagent \
+  %{buildroot}%{_pkglibexecdir}
+# nxwrapper
+sed -e's,@PKGLIBDIR@,%{_pkglibdir},g' \
+    -e's,@PKGLIBEXECDIR@,%{_pkglibexecdir},g' \
+  < %{SOURCE8} > %{buildroot}%{_bindir}/nxwrapper
+chmod 0755 %{buildroot}%{_bindir}/nxwrapper
+ln -s nxwrapper %{buildroot}%{_bindir}/nxagent
 # install Compression Libraries and Proxy
-cp -a nxcomp/libXcomp.so.* %{buildroot}/%{_libdir}/NX/lib
-cp -a nxcompext/libXcompext.so.* %{buildroot}/%{_libdir}/NX/lib
-install -m 755 nxproxy/nxproxy %{buildroot}/%{_libdir}/NX
-ln -snf nxagent %{buildroot}/%{_bindir}/nxproxy
-# install nxssh
-pushd nxssh
-  cp -a nxssh %{buildroot}/%{_libdir}/NX
-  ln -snf nxagent %{buildroot}/%{_bindir}/nxssh
-  chmod 755 %{buildroot}/%{_bindir}/nxssh
-popd
+install -p -m 0755 nxcomp/libXcomp.so.* %{buildroot}%{_pkglibdir}
+install -p -m 0755 nxcompext/libXcompext.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}/%{_bindir}/nxviewer %{buildroot}/%{_libdir}/NX
-  ln -snf nxagent %{buildroot}/%{_bindir}/nxviewer
-  chmod 755 %{buildroot}/%{_bindir}/nxviewer
+  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}/%{_libdir}/NX
-  ln -snf nxagent %{buildroot}/%{_bindir}/nxdesktop
-  chmod 755 %{buildroot}/%{_bindir}/nxdesktop
+  mv %{buildroot}%{_bindir}/nxdesktop %{buildroot}%{_pkglibexecdir}
+  ln -s nxwrapper %{buildroot}%{_bindir}/nxdesktop
   mv %{buildroot}/usr/man/man1/nxdesktop.1 \
-     %{buildroot}/%{_mandir}/man1/nxdesktop.1
+    %{buildroot}%{_mandir}/man1/nxdesktop.1
   rm -rf %{buildroot}/usr/man
 popd
 %endif
 # install scripts
-mkdir -p %{buildroot}/%{_datadir}/doc/%{name}-%{version}
-cp -r nxscripts %{buildroot}/%{_datadir}/doc/%{name}-%{version}
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cp -a nxscripts %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 # documentation and license
-tar xjf %{SOURCE10} -C %{buildroot}/%{_datadir}/doc/%{name}-%{version}
-install -m 644 nxcomp/LICENSE   %{buildroot}/%{_datadir}/doc/%{name}-%{version}
+tar xjf %{SOURCE9} -C %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+install -m 644 nxcomp/LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 for i in nxcomp nxdesktop; do
-  mkdir %{buildroot}/%{_datadir}/doc/%{name}-%{version}/$i
+  mkdir %{buildroot}%{_defaultdocdir}/%{name}-%{version}/$i
 done
-install -m 644 nxcomp/README    %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxcomp
-install -m 644 nxdesktop/README %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxdesktop
+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 -r nxdesktop/doc %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxdesktop
-
-%post
-%{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcomp.so.%{version}' 2>/dev/null || :
-%{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcompext.so.%{version}' 2>/dev/null || :
-%{_bindir}/chcon -t textrel_shlib_t %{_libdir}/NX/lib/libXcomp.so.%{version} 2>/dev/null || :
-%{_bindir}/chcon -t textrel_shlib_t %{_libdir}/NX/lib/libXcompext.so.%{version} 2>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
-  %{_sbindir}/semanage fcontext -f -- -d -t textrel_shlib_t '%{_libdir}/NX/lib/libXcomp.so.%{version}' 2>/dev/null || :
-  %{_sbindir}/semanage fcontext -f -- -d -t textrel_shlib_t '%{_libdir}/NX/lib/libXcompext.so.%{version}' 2>/dev/null || :
-fi
+cp -ar nxdesktop/doc/* \
+  %{buildroot}%{_defaultdocdir}/%{name}-%{version}/nxdesktop/
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}
+%doc %{_defaultdocdir}/%{name}-%{version}
 %{_bindir}/*
-%dir %{_libdir}/NX
-%{_libdir}/NX/*
+%{_pkglibdir}
+%{_pkglibexecdir}
 %ifnarch ppc ppc64 s390 s390x
-%dir %{_datadir}/NX
+%{_pkgdatadir}
 %{_mandir}/man1/nxdesktop.1.gz
-%{_datadir}/NX/keymaps-windows/
 %endif
 
 %changelog
-* Thu Sep 28 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.1.0-1
-- updated to 2.1.0 release
-* Mon Aug 28 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.0.0-4
-- upped release for rebuild request
-- removed link in post for /usr/X11R6/lib/X11 as it is now
-  handled in freenx
-- updated to maintenance release 2
-- added nxssh component for future qtnx client
-* Thu Jul 13 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.0.0-3
-- updated to 2.0.0 Maintenance release 1
-* Tue Jul 11 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.0.0-1
-- upgraded to 2.0.0
-- removed renderextension patch as it is unnecessary
-- cleaned up spec file
-* Tue Jun 13 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-11
-- fixed documentation directory problems BZ#194964
-* Sat Jun 10 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-10
-- added Source11 to filter find-provides from showing libraries that should not
-  be provided to the system. BZ#194652
-* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-9
-- added Dist tag
-- fixed macro/variable inconsistencies
-- added requires: post and postun for policycoreutils
-* Tue Jun 06 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-8
-- adapting spec for fedora-extras
-- excluding x86_64 arch at this time. nxagent causes segfaults
-* Mon May 08 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-7.FC5
-- added a section to %post that links /usr/X11R6/lib/X11 to /usr/share/X11
-  which is needed for nxagent to function properly
-* Sun May 07 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-6.FC5
-- added support for selinux
-* Tue May 02 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-5.FC5
-- reenabled nxviewer
-* Mon May 01 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-4.FC5.2
-- rebuilt for FC5
-- nxviewer still disabled
-* Mon Jan 30 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-4.FC5
-- disabled the nxviewer build because it doesn't like modular X
-- updated xorg dependencies
-* Tue Dec 13 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-4
-- updated perl script line 76 to have quotes
-* Tue Dec 13 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-3
-- updated all components to most recent release - Maintenance 3
-- removed NX-1.5.diff
-* Wed Aug 31 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-2
-- updated nxagent to ver .90
-- added patches from SuSE to update some compiler warnings and buffer overflows
-* Fri Aug 12 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-1
-- updated nxcomp to ver .65
-* Tue Jul 26 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-0
-- Updated to 1.5.0 final
-* Mon Jul 11 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.4.9.4-0
-- Updated to 1.5.0 snapshot 4
-* Thu Jun 30 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.4.9.3-0
-- reworked package for update to 1.5.0 devel snapshot 3 (1.4.9.3)
-- Commented out Xtranssock patch in NX.diff (doesn't seem to be necessary)
-* Mon Apr 11 2005 Tom "spot" Callaway <tcallawa redhat com> - 1.4.0-5
-- spec cleanups
-- reworked Patch1 to make it apply without arch conditional
-* Mon Feb 14 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-4
+* Mon Feb 19 2007 Axel Thimm <Axel Thimm ATrpms net> - 2.1.0-18
+- Update to 2.1.0 (4th? maintenance release).
+
+* Tue Jan 17 2006 Axel Thimm <Axel Thimm ATrpms net>
+- Update to maintenance release.
+
+* Sat Jul 30 2005 Axel Thimm <Axel Thimm ATrpms net>
+- Update to nx 1.5.0. final.
+
+* Mon Feb 14 2005 Rick Stout <zipsonic[AT]gmail.com> - 4:1.4.0
 - updated nx-X11, nxproxy, nxcomp, nxagent and nxdesktop
 - released to address X11 security concerns.
-* Tue Nov 09 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-3
+
+* Tue Nov 09 2004 Rick Stout <zipsonci[AT]gmail.com> - 3:1.4.0
 - updated to 1.4.0 final
-* Mon Oct 11 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-2
+
+* Mon Oct 11 2004 Rick Stout <zipsonic[AT]gmail.com> - 2:1.4.0
 - Changed naming structure to be more friendly (lowercase)
-* Fri Oct 07 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-1
+
+* Fri Oct 07 2004 Rick Stout <zipsonic[AT]gmail.com> - 1:1.4.0
 - Updated package dependencies
-* Wed Sep 29 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-0
+
+* Wed Sep 29 2004 Rick Stout <zipsonic[AT]gmail.com> - 0:1.4.0
 - Initial Fedora RPM release.
 - Updated SuSE package to work with Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Sep 2006 17:26:18 -0000	1.8
+++ sources	19 May 2007 11:28:21 -0000	1.9
@@ -1,10 +1,9 @@
 0511072ee377316879bb91a75153ed47  docs.tar.bz2
-b82d5272adc23117596095fffcfb04a0  nx-X11-2.1.0-2.tar.gz
-a3bb392d9af8286c1bb62d40bc51458f  nxagent-2.1.0-9.tar.gz
-e99094ba63659fed3b4b518636d3b5e8  nxcomp-2.1.0-3.tar.gz
-f5794599ad245a3c0a12db8aea00846e  nxcompext-2.1.0-3.tar.gz
-8afb8acfbbc27ad0047990bae9907e0a  nxdesktop-2.1.0-3.tar.gz
-ea29b44015da4d2553c54e18be3e8580  nxproxy-2.1.0-2.tar.gz
-6ff9bcf65a7527fa8b4dcfd09c234e51  nxscripts-2.1.0-1.tar.gz
-ae6d2e3108580caceccc349f01a49ee5  nxssh-2.1.0-1.tar.gz
-592747f725550320b3b820bbb531fd6c  nxviewer-2.1.0-4.tar.gz
+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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]