rpms/nx/F-7 nxfind-provides.sh,1.2,1.3 nx.spec,1.9,1.10

Axel Thimm (athimm) fedora-extras-commits at redhat.com
Tue May 22 09:59:35 UTC 2007


Author: athimm

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

Modified Files:
	nx.spec 
Added Files:
	nxfind-provides.sh 
Log Message:
Try to fix #240835.


Index: nxfind-provides.sh
===================================================================
RCS file: nxfind-provides.sh
diff -N nxfind-provides.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nxfind-provides.sh	22 May 2007 09:59:00 -0000	1.3
@@ -0,0 +1,4 @@
+#!/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/F-7/nx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nx.spec	17 May 2007 12:07:22 -0000	1.9
+++ nx.spec	22 May 2007 09:59:00 -0000	1.10
@@ -1,6 +1,3 @@
-%define _x_libraries %{_libdir}
-%define _x_bindir %{_bindir}
-
 %define _pkglibdir %{_libdir}/nx
 %define _pkgdatadir %{_datadir}/nx
 %define _pkglibexecdir %{_libexecdir}/nx
@@ -8,7 +5,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 2.1.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPL, MIT/X11 for X11 bits
 Group: Applications/Internet
 URL: http://www.nomachine.com
@@ -30,6 +27,11 @@
 Source8: nxwrapper.in
 Source9: docs.tar.bz2
 
+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
@@ -191,6 +193,10 @@
 %endif
 
 %changelog
+* 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).
 




More information about the fedora-extras-commits mailing list