rpms/mesa/devel mesa.spec,1.44,1.45

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Mar 1 06:16:13 UTC 2006


Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12487

Modified Files:
	mesa.spec 
Log Message:
Minor spec cleanups


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mesa.spec	25 Feb 2006 18:47:36 -0000	1.44
+++ mesa.spec	1 Mar 2006 06:16:10 -0000	1.45
@@ -84,7 +84,9 @@
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
 
 BuildRequires: pkgconfig
+%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.0-1
+%endif
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel
 BuildRequires: xorg-x11-proto-devel >= 7.0-3
@@ -274,8 +276,6 @@
 #-- Install ----------------------------------------------------------
 %install
 rm -rf $RPM_BUILD_ROOT
-# NOTE: the rpm makeinstall macro does not work for mesa
-#%%makeinstall DESTDIR=$RPM_BUILD_ROOT
 # NOTE: "make install" calls mesa's installmesa script, passing DESTDIR
 # to it as a commandline arg, but LIB_DIR and INCLUDE_DIR get hard coded in
 # that script, meaning multilib breaks.
@@ -284,8 +284,7 @@
 # NOTE: Since Mesa's install procedure doesn't work on multilib properly,
 # we fix it here, as I have patched the installmesa script to remove the
 # hard coding, and we set the variables ourself right here, and it should
-# hopefully pick them up.
-#	-- Mike A. Harris <mharris at redhat.com>
+# hopefully pick them up.  -- mharris at redhat.com
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
 bin/installmesa $RPM_BUILD_ROOT/usr




More information about the fedora-cvs-commits mailing list