rpms/nx/devel nxfind-provides.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 nx.spec, 1.2, 1.3 sources, 1.3, 1.4 RenderExtension.diff, 1.1, NONE
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Wed Jul 12 18:51:42 UTC 2006
Author: zipsonic
Update of /cvs/extras/rpms/nx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23030/devel
Modified Files:
.cvsignore nx.spec sources
Added Files:
nxfind-provides.sh
Removed Files:
RenderExtension.diff
Log Message:
auto-import nx-2.0.0-1.fc6 on branch devel from nx-2.0.0-1.fc6.src.rpm
--- NEW FILE nxfind-provides.sh ---
#!/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//
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Jun 2006 06:43:51 -0000 1.3
+++ .cvsignore 12 Jul 2006 18:51:42 -0000 1.4
@@ -1,9 +1,9 @@
docs.tar.bz2
-nx-X11-1.5.0-21.tar.gz
-nxagent-1.5.0-112.tar.gz
-nxcomp-1.5.0-80.tar.gz
-nxcompext-1.5.0-20.tar.gz
-nxdesktop-1.5.0-78.tar.gz
-nxproxy-1.5.0-9.tar.gz
-nxscripts-1.5.0-11.tar.gz
-nxviewer-1.5.0-15.tar.gz
+nx-X11-2.0.0-31.tar.gz
+nxagent-2.0.0-85.tar.gz
+nxcomp-2.0.0-81.tar.gz
+nxcompext-2.0.0-33.tar.gz
+nxdesktop-2.0.0-50.tar.gz
+nxproxy-2.0.0-2.tar.gz
+nxscripts-2.0.0-2.tar.gz
+nxviewer-2.0.0-14.tar.gz
Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/nx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nx.spec 8 Jun 2006 06:43:51 -0000 1.2
+++ nx.spec 12 Jul 2006 18:51:42 -0000 1.3
@@ -1,29 +1,32 @@
Name: nx
-Version: 1.5.0
-Release: 9%{?dist}
+Version: 2.0.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-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
+Source0: nxproxy-%{version}-2.tar.gz
+Source1: nxcomp-%{version}-81.tar.gz
+Source2: nxcompext-%{version}-33.tar.gz
+Source3: nx-X11-%{version}-31.tar.gz
+Source4: nxagent-%{version}-85.tar.gz
+Source5: nxviewer-%{version}-14.tar.gz
+Source6: nxdesktop-%{version}-50.tar.gz
+Source7: nxscripts-%{version}-2.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
+%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
@@ -38,7 +41,6 @@
%prep
%setup -q -T -c %{name}-%{version} -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7
%patch0 -p0
-%patch3 -p0
pushd nx-X11
%patch1 -p0
%patch2 -p1
@@ -130,24 +132,24 @@
popd
%endif
# install scripts
-mkdir -p %{buildroot}/%{_datadir}/doc/packages/NX
-cp -r nxscripts %{buildroot}/%{_datadir}/doc/packages/NX
+mkdir -p %{buildroot}/%{_datadir}/doc/%{name}-%{version}
+cp -r nxscripts %{buildroot}/%{_datadir}/doc/%{name}-%{version}
# documentation and license
-tar xjf %{SOURCE10} -C %{buildroot}/%{_datadir}/doc/packages/NX
-install -m 644 nxcomp/LICENSE %{buildroot}/%{_datadir}/doc/packages/NX
+tar xjf %{SOURCE10} -C %{buildroot}/%{_datadir}/doc/%{name}-%{version}
+install -m 644 nxcomp/LICENSE %{buildroot}/%{_datadir}/doc/%{name}-%{version}
for i in nxcomp nxdesktop; do
- mkdir %{buildroot}/%{_datadir}/doc/packages/NX/$i
+ mkdir %{buildroot}/%{_datadir}/doc/%{name}-%{version}/$i
done
-install -m 644 nxcomp/README %{buildroot}/%{_datadir}/doc/packages/NX/nxcomp
-install -m 644 nxdesktop/README %{buildroot}/%{_datadir}/doc/packages/NX/nxdesktop
+install -m 644 nxcomp/README %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxcomp
+install -m 644 nxdesktop/README %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxdesktop
rm -rf nxdesktop/doc/CVS
-cp -r nxdesktop/doc %{buildroot}/%{_datadir}/doc/packages/NX/nxdesktop
+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.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 || :
+%{_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 || :
if [ ! -e /usr/X11R6/lib/X11 ]
then
mkdir -p /usr/X11R6/lib 2>/dev/null || :
@@ -156,8 +158,8 @@
%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 || :
+ %{_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
%clean
@@ -165,10 +167,9 @@
%files
%defattr(-,root,root,-)
-%doc %{_datadir}/doc/packages/NX
+%doc %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%dir %{_libdir}/NX
-%dir %{_libdir}/NX/lib
%{_libdir}/NX/*
%ifnarch ppc ppc64 s390 s390x
%dir %{_datadir}/NX
@@ -177,6 +178,15 @@
%endif
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Jun 2006 06:43:51 -0000 1.3
+++ sources 12 Jul 2006 18:51:42 -0000 1.4
@@ -1,9 +1,9 @@
0511072ee377316879bb91a75153ed47 docs.tar.bz2
-11877c3357732a957e3bf7e3d2f2ca0a nx-X11-1.5.0-21.tar.gz
-160726ed67698a9694b707950c49e19e nxagent-1.5.0-112.tar.gz
-782f04870142c9fc5b2e1f654fd0a5d7 nxcomp-1.5.0-80.tar.gz
-6a5b8b79b9e0cc81b88233b18c4f227f nxcompext-1.5.0-20.tar.gz
-6c20c1300ca6b4d362237ef44cfee7f7 nxdesktop-1.5.0-78.tar.gz
-d2e3c1a109db336dfa497f4c2004f2d5 nxproxy-1.5.0-9.tar.gz
-9432195d04bf226909bc5d68773657a3 nxscripts-1.5.0-11.tar.gz
-ff3e5a4c1601b58f5fc405f990691bdf nxviewer-1.5.0-15.tar.gz
+0c63cfdc37658eb74f4a84077b05fe9e nx-X11-2.0.0-31.tar.gz
+c78ce7a88d1cc8691d4997a69863c4c0 nxagent-2.0.0-85.tar.gz
+fa6663ef31787d2a49982450928bf0cd nxcomp-2.0.0-81.tar.gz
+d6738f330687d6c986600a9685e527cf nxcompext-2.0.0-33.tar.gz
+f55dc97544a061dfa0f099329dcc3f53 nxdesktop-2.0.0-50.tar.gz
+b078c19372c82e85667cbbac880fa688 nxproxy-2.0.0-2.tar.gz
+f02c316e88e63a69139105bbfb2e77e8 nxscripts-2.0.0-2.tar.gz
+99da22474dc446ac536475e8d6e99278 nxviewer-2.0.0-14.tar.gz
--- RenderExtension.diff DELETED ---
More information about the scm-commits
mailing list