- GL manpages replaced by S: OpenGL-doc-man (OpenGL 1.2.1 docs package common for...

[packages/Mesa.git] / Mesa.spec

diff --git a/Mesa.spec b/Mesa.spec
index 81cfaeb118cb9d0db2cb85aae765da6804b7c8c5..86779fc0c1dc8a594ae18752d8be9830495ddbd0 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -21,21 +21,19 @@
 # (until they start to be somehow versioned themselves)
 %define                glapi_ver       7.1.0
 #
-%define                snap            -rc3
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
 Version:       7.7
-Release:       0.1%{?with_multigl:.mgl}
+Release:       1%{?with_multigl:.mgl}
 License:       MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:         X11/Libraries
-Source0:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}%{snap}.tar.bz2
-# Source0-md5: 775c278a211deacd722ed599e706a20e
-Source1:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Demos-%{version}%{snap}.tar.bz2
-# Source1-md5: 2404747b148e05ca74ffb243b6e26606
-Source2:       http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
-# Source2-md5: 6ae05158e678f4594343f32c2ca50515
+Source0:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
+# Source0-md5: e3fa64a1508bc23dd9de9dd2cea7cfb1
+Source1:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Demos-%{version}.tar.bz2
+# Source1-md5: 6fd616b27b9826d0faa23e08e05d9435
 Patch0:                %{name}-realclean.patch
+Patch1:                %{name}-tgsi_dump.patch
 URL:           http://www.mesa3d.org/
 %{?with_demos:BuildRequires:   OpenGL-glut-devel >= 3.8}
 BuildRequires: autoconf
@@ -123,6 +121,7 @@ Group:              X11/Development/Libraries
 # loose dependency on libGL to use with other libGL binaries
 Requires:      OpenGL >= 1.5
 Requires:      xorg-lib-libX11-devel
+Suggests:      OpenGL-doc-man
 Provides:      OpenGL-GLX-devel = 1.4
 Provides:      OpenGL-devel = 2.1
 Obsoletes:     Mesa-devel
@@ -619,8 +618,9 @@ X.org DRI driver for VMWare.
 Sterownik X.org DRI dla VMware.
 
 %prep
-%setup -q -b1 -a2
+%setup -q -b1
 %patch0 -p0
+%patch1 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
@@ -688,6 +688,7 @@ mv %{_lib} osmesa32
 %if %{with gallium}
        --enable-gallium \
        --%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
+       --enable-gallium-svga \
        --enable-gallium-nouveau \
        --with-state-trackers=dri \
 %else
@@ -703,10 +704,6 @@ mv %{_lib} osmesa32
 %{__make} -C progs/demos
 %endif
 
-cd gl-manpages-*
-%configure
-%{__make}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -716,11 +713,6 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_examplesdir}/%{name}-%{version}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cd gl-manpages-*
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-cd ..
-
 %if %{with osmesa}
 install osmesa*/* $RPM_BUILD_ROOT%{_libdir}
 %endif
@@ -801,8 +793,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/internal/dri_interface.h
 %{_pkgconfigdir}/dri.pc
 %{_pkgconfigdir}/gl.pc
-%{_mandir}/man3/gl[^uX]*.3gl*
-%{_mandir}/man3/glX*.3gl*
 
 %if %{with static}
 %files libGL-static
@@ -821,7 +811,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glu.h
 %{_includedir}/GL/glu_mangle.h
 %{_pkgconfigdir}/glu.pc
-%{_mandir}/man3/glu*.3gl*
 
 %if %{with static}
 %files libGLU-static
@@ -956,7 +945,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dri-driver-vmwgfx
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
 
 %if %{with demos}
 %files demos