rpms/nx/FC-5 nxfind-provides.sh,NONE,1.1 nx.spec,1.3,1.4

Richard A. Stout (zipsonic) fedora-extras-commits at redhat.com
Sun Jun 11 02:37:37 UTC 2006


Author: zipsonic

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

Modified Files:
	nx.spec 
Added Files:
	nxfind-provides.sh 
Log Message:
auto-import nx-1.5.0-10 on branch FC-5 from nx-1.5.0-10.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: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-5/nx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nx.spec	8 Jun 2006 06:39:28 -0000	1.3
+++ nx.spec	11 Jun 2006 02:37:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nx
 Version:        1.5.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Proxy system for X11
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 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
@@ -24,6 +25,9 @@
 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
@@ -168,7 +172,7 @@
 %doc %{_datadir}/doc/packages/NX
 %{_bindir}/*
 %dir %{_libdir}/NX
-%dir %{_libdir}/NX/lib
+#%dir %{_libdir}/NX/lib
 %{_libdir}/NX/*
 %ifnarch ppc ppc64 s390 s390x
 %dir %{_datadir}/NX
@@ -177,6 +181,9 @@
 %endif
 
 %changelog
+* 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.
 * Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-9
 - added Dist tag
 - fixed macro/variable inconsistencies




More information about the fedora-extras-commits mailing list