rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.170.2.4, 1.170.2.5

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11371

Modified Files:
      Tag: private-1_2-branch
	xorg-x11-server.spec 
Log Message:
* Fri Oct 6 2006 Adam Jackson <ajackson at redhat.com> 1.1.99.3-0.3.olpc1
- OLPC: Remove scanpci from the install so rpm doesn't include it, and
  thereby pick up a (bogus) DT_NEEDED on libscanpci.so.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.170.2.4
retrieving revision 1.170.2.5
diff -u -r1.170.2.4 -r1.170.2.5
--- xorg-x11-server.spec	6 Oct 2006 03:27:46 -0000	1.170.2.4
+++ xorg-x11-server.spec	6 Oct 2006 15:51:49 -0000	1.170.2.5
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.99.3
-Release:   0.1.olpc1
+Release:   0.3.olpc1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -488,6 +488,7 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/ioport
     rm -f $RPM_BUILD_ROOT%{_bindir}/out?
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
+    rm -f $RPM_BUILD_ROOT%{_bindir}/scanpci
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
 %endif
 }
@@ -556,7 +557,9 @@
 %attr(4711, root, root) %{_bindir}/Xorg
 %{_bindir}/gtf
 %{_bindir}/cvt
+%if !%{xolpc}
 %{_bindir}/scanpci
+%endif
 %dir %{_datadir}/xorg
 %{_datadir}/xorg/vesamodes
 %{_datadir}/xorg/extramodes
@@ -711,6 +714,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Oct 6 2006 Adam Jackson <ajackson at redhat.com> 1.1.99.3-0.3.olpc1
+- OLPC: Remove scanpci from the install so rpm doesn't include it, and
+  thereby pick up a (bogus) DT_NEEDED on libscanpci.so.
+
 * Thu Oct 5 2006 Adam Jackson <ajackson at redhat.com> 1.1.99.3-0.2.olpc1
 - Add OLPC build tuning.  Slightly gross atm, needs rework.