rpms/nx/FC-4 nx.spec,1.2,1.3 nxfind-provides.sh,1.1,1.2
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Fri Jun 1 00:07:06 UTC 2007
Author: athimm
Update of /cvs/extras/rpms/nx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4070/FC-4
Modified Files:
nx.spec nxfind-provides.sh
Log Message:
Apply ATrpms' x86_64 provide fix.
Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-4/nx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nx.spec 12 Jun 2006 04:22:48 -0000 1.2
+++ nx.spec 1 Jun 2007 00:06:30 -0000 1.3
@@ -1,83 +1,99 @@
-Name: nx
-Version: 1.5.0
-Release: 10%{?dist}
-Summary: Proxy system for X11
-
-Group: Applications/Internet
-License: GPL, MIT/X11 for X11 bits
-URL: http://www.nomachine.com
-Source0: nxproxy-1.5.0-9.tar.gz
-Source1: nxcomp-1.5.0-80.tar.gz
-Source2: nxcompext-1.5.0-20.tar.gz
-Source3: nx-X11-1.5.0-21.tar.gz
-Source4: nxagent-1.5.0-112.tar.gz
-Source5: nxviewer-1.5.0-15.tar.gz
-Source6: nxdesktop-1.5.0-78.tar.gz
-Source7: nxscripts-1.5.0-11.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
-Patch3: RenderExtension.diff
-Patch5: NX-bufferoverflow.diff
-Patch6: NX-data-range.patch
-Patch7: ppc-no-signed-char.diff
+%{!?_x_libraries:%global _x_libraries %{_libdir}}
+%{!?_x_bindir:%global _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: 22%{?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
+
+Source11: nxfind-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{SOURCE11}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
-BuildRequires: expat-devel audiofile-devel openssl-devel libjpeg-devel libpng-devel XFree86-devel xorg-x11-deprecated-libs-devel
-Requires: xorg-x11 xorg-x11-tools
-Requires(post): policycoreutils
-Requires(postun): policycoreutils
-Excludearch: x86_64
%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
-%patch0 -p0
-%patch3 -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
-%ifarch x86_64
-export CFLAGS="%{optflags} -fPIC"
-export CXXFLAGS="%{optflags} -fPIC"
-%else
export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+%ifarch x86_64
+export CFLAGS="$CFLAGS -fPIC"
%endif
-perl -pi -e"s|CXXFLAGS=.-O.*|CXXFLAGS=\"$CXXFLAGS\"|" */configure
+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
@@ -90,136 +106,128 @@
# build RFB Agent
pushd nxviewer
xmkmf -a
- cp -a /usr/X11R6/%{_lib}/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 $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+rm -rf %{buildroot}
+
+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.* \
- $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-install -m 755 nx-X11/programs/Xserver/nxagent \
- $RPM_BUILD_ROOT/%{_libdir}/NX
-install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{_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, at PKGLIBDIR@,%{_pkglibdir},g' \
+ -e's, at 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.* $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-cp -a nxcompext/libXcompext.so.* $RPM_BUILD_ROOT/%{_libdir}/NX/lib
-install -m 755 nxproxy/nxproxy $RPM_BUILD_ROOT/%{_libdir}/NX
-ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxproxy
+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=$RPM_BUILD_ROOT
- mv $RPM_BUILD_ROOT/usr/X11R6/bin/nxviewer $RPM_BUILD_ROOT/%{_libdir}/NX
- ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxviewer
- chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxviewer
- mv $RPM_BUILD_ROOT/usr/X11R6/bin/nxpasswd $RPM_BUILD_ROOT/%{_bindir}
+ 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=$RPM_BUILD_ROOT
- mv $RPM_BUILD_ROOT/%{_bindir}/nxdesktop $RPM_BUILD_ROOT/%{_libdir}/NX
- ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxdesktop
- chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxdesktop
- mv $RPM_BUILD_ROOT/usr/man/man1/nxdesktop.1 \
- $RPM_BUILD_ROOT/%{_mandir}/man1/nxdesktop.1
- rm -rf $RPM_BUILD_ROOT/usr/man
+ 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 $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
-cp -r nxscripts $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cp -a nxscripts %{buildroot}%{_defaultdocdir}/%{name}-%{version}
# documentation and license
-tar xjf %{SOURCE10} -C $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
-install -m 644 nxcomp/LICENSE $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
+tar xjf %{SOURCE9} -C %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+install -m 644 nxcomp/LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}
for i in nxcomp nxdesktop; do
- mkdir $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/$i
+ mkdir %{buildroot}%{_defaultdocdir}/%{name}-%{version}/$i
done
-install -m 644 nxcomp/README $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxcomp
-install -m 644 nxdesktop/README $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/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 $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxdesktop
-
-%post
-%{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcomp.so.1.5.0' 2>/dev/null || :
-%{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcompext.so.1.5.0' 2>/dev/null || :
-%{_bindir}/chcon -t textrel_shlib_t %{_libdir}/NX/lib/libXcomp.so.1.5.0 2>/dev/null || :
-%{_bindir}/chcon -t textrel_shlib_t %{_libdir}/NX/lib/libXcompext.so.1.5.0 2>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
- %{_sbindir}/semanage fcontext -f -- -d -t textrel_shlib_t '%{_libdir}/NX/lib/libXcomp.so.1.5.0' 2>/dev/null || :
- %{_sbindir}/semanage fcontext -f -- -d -t textrel_shlib_t '%{_libdir}/NX/lib/libXcompext.so.1.5.0' 2>/dev/null || :
-fi
+cp -ar nxdesktop/doc/* \
+ %{buildroot}%{_defaultdocdir}/%{name}-%{version}/nxdesktop/
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc %{_datadir}/doc/packages/NX
+%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
-* Sun Jun 11 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-10
-- upping package release to match FC5
-- added Source11 to filter find-provides from showing libraries that should not
- be provided to the system.
-- added Dist tag
-- fixed macro/variable inconsistencies
-- added requires: post and postun for policycoreutils
-- adapting spec for fedora-extras
-- excluding x86_64 arch at this time. nxagent causes segfaults
-- added support for selinux
-* 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 compents 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 at 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
+* Fri Jun 1 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1.0-22
+- Sync with ATrpms' nxfindprovides helper.
+
+* Wed May 23 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1.0-21.1
+- Fix typo in nxwrapper.in (PKGEXECDIR -> PKGLIBEXECDIR).
+
+* Tue May 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1.0-20
+- readded Source11 to filter find-provides from showing libraries that
+ should not be provided to the system. BZ#194652 & 240835.
+
+* Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1.0-18
+- Update to 2.1.0 (4th? maintenance release).
+
+* Tue Jan 17 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to maintenance release.
+
+* Sat Jul 30 2005 Axel Thimm <Axel.Thimm at 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 <zipsonci[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: nxfind-provides.sh
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-4/nxfind-provides.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nxfind-provides.sh 12 Jun 2006 04:22:48 -0000 1.1
+++ nxfind-provides.sh 1 Jun 2007 00:06:31 -0000 1.2
@@ -1,4 +1,3 @@
-#!/bin/sh
-exec /usr/lib/rpm/find-provides | \
- sed -e s/libX11.so.6.2.debug// | sed -e s/libXrender.so.1.2.debug// | sed -e s/libXext.so.6.4.debug// | \
- sed -e s/libX11.so.6// | sed -e s/libXrender.so.1// | sed -e s/libXext.so.6//
+#! /bin/sh
+
+`rpm -E %__find_provides` "$@" | egrep -v "(libX11|libXrender|libXext)\.so"
More information about the fedora-extras-commits
mailing list