Author: qboosh Date: Thu Jan 14 18:52:35 2010 GMT Module: packages Tag: HEAD ---- Log message: - GL manpages replaced by S: OpenGL-doc-man (OpenGL 1.2.1 docs package common for all OpenGL implementations)
---- Files affected: packages/Mesa: Mesa.spec (1.233 -> 1.234) ---- Diffs: ================================================================ Index: packages/Mesa/Mesa.spec diff -u packages/Mesa/Mesa.spec:1.233 packages/Mesa/Mesa.spec:1.234 --- packages/Mesa/Mesa.spec:1.233 Sun Jan 10 11:55:43 2010 +++ packages/Mesa/Mesa.spec Thu Jan 14 19:52:29 2010 @@ -33,8 +33,6 @@ # Source0-md5: e3fa64a1508bc23dd9de9dd2cea7cfb1 Source1: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Demos-%{version}.tar.bz2 # Source1-md5: 6fd616b27b9826d0faa23e08e05d9435 -Source2: http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2 -# Source2-md5: 6ae05158e678f4594343f32c2ca50515 Patch0: %{name}-realclean.patch Patch1: %{name}-tgsi_dump.patch URL: http://www.mesa3d.org/ @@ -124,6 +122,7 @@ # 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 @@ -620,7 +619,7 @@ Sterownik X.org DRI dla VMware. %prep -%setup -q -b1 -a2 +%setup -q -b1 %patch0 -p0 %patch1 -p1 @@ -706,10 +705,6 @@ %{__make} -C progs/demos %endif -cd gl-manpages-* -%configure -%{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -719,11 +714,6 @@ %{__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 @@ -804,8 +794,6 @@ %{_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 @@ -824,7 +812,6 @@ %{_includedir}/GL/glu.h %{_includedir}/GL/glu_mangle.h %{_pkgconfigdir}/glu.pc -%{_mandir}/man3/glu*.3gl* %if %{with static} %files libGLU-static @@ -973,6 +960,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.234 2010/01/14 18:52:29 qboosh +- GL manpages replaced by S: OpenGL-doc-man (OpenGL 1.2.1 docs package common for all OpenGL implementations) + Revision 1.233 2010/01/10 10:55:43 qboosh - added tgsi_dump patch (fixes conflict with fortify printf redirect in glibc) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.233&r2=1.234&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
