summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharris <mharris@fedoraproject.org>2006-03-01 06:16:10 +0000
committermharris <mharris@fedoraproject.org>2006-03-01 06:16:10 +0000
commit359440a6ea4eeece811377fdb1d334f1272ff305 (patch)
tree61969b03b6a740ddef4d01a75357727c97537280
parent3d63acc32fae57c9f4d1e6087d1c21907c9c2525 (diff)
downloadmesa-359440a6ea4eeece811377fdb1d334f1272ff305.tar.gz
mesa-359440a6ea4eeece811377fdb1d334f1272ff305.tar.xz
mesa-359440a6ea4eeece811377fdb1d334f1272ff305.zip
Minor spec cleanups
-rw-r--r--mesa.spec7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesa.spec b/mesa.spec
index ec15146..b7c92c2 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -84,7 +84,9 @@ Patch200: mesa-6.4.1-texture-from-drawable.patch
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 @@ make -C progs/xdemos glxgears glxinfo
#-- 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 @@ rm -rf $RPM_BUILD_ROOT
# 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@redhat.com>
+# hopefully pick them up. -- mharris@redhat.com
export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
bin/installmesa $RPM_BUILD_ROOT/usr