summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2007-09-28 22:15:55 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit5818e6f7ac7c74832f8cd5199b869f8207b2b0ef (patch)
tree478b6b445e7b95750714bb3cc69707efe508e6d7
parenta2076a712dce0abaef78c6e4bbc9695d334f0848 (diff)
downloadMesa-auto/ti/Mesa-7_0_1-2.zip
Mesa-auto/ti/Mesa-7_0_1-2.tar.gz
- moved contents of MULTIGL branch to multigl bcond on HEADauto/ti/Mesa-7_0_1-2
Changed files: Mesa.spec -> 1.159
-rw-r--r--Mesa.spec24
1 files changed, 21 insertions, 3 deletions
diff --git a/Mesa.spec b/Mesa.spec
index b5a5d0a..a1c0026 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -6,12 +6,13 @@
#
# Conditional build:
%bcond_without motif # build static libGLw without Motif interface
+%bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers
#
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
Version: 7.0.1
-Release: 2
+Release: 2%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see COPYRIGHT file
Group: X11/Libraries
Source0: http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
@@ -35,8 +36,6 @@ BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-util-makedepend
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _sysconfdir /etc/X11
-
%description
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command
@@ -617,6 +616,15 @@ done
rm -rf progs && mv -f progs.org progs
rm -rf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}}
+%if %{with multigl}
+install -d $RPM_BUILD_ROOT{%{_libdir}/Mesa,%{_sysconfdir}/ld.so.conf.d}
+
+mv -f $RPM_BUILD_ROOT%{_libdir}/libGL.so.* $RPM_BUILD_ROOT%{_libdir}/Mesa
+ln -sf Mesa/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
+
+echo %{_libdir}/Mesa >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/Mesa.conf
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -632,11 +640,18 @@ rm -rf $RPM_BUILD_ROOT
%files libGL
%defattr(644,root,root,755)
%doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS},RELNOTES*}
+%if %{with multigl}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/Mesa.conf
+%dir %{_libdir}/Mesa
+%attr(755,root,root) %{_libdir}/Mesa/libGL.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/Mesa/libGL.so.1
+%else
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
# symlink for binary apps which fail to conform Linux OpenGL ABI
# (and dlopen libGL.so instead of libGL.so.1)
%attr(755,root,root) %{_libdir}/libGL.so
+%endif
%files libGL-devel
%defattr(644,root,root,755)
@@ -653,6 +668,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/GL/xmesa.h
%{_includedir}/GL/xmesa_x.h
%{_includedir}/GL/xmesa_xf86.h
+%if %{with multigl}
+%attr(755,root,root) %{_libdir}/libGL.so
+%endif
%files libGL-static
%defattr(644,root,root,755)