rpms/mesa/devel .cvsignore, 1.12, 1.13 mesa.spec, 1.108, 1.109 sources, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: sandmann

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

Modified Files:
	.cvsignore mesa.spec sources 
Log Message:
Add man pages from X R6.9


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	19 Sep 2006 18:38:17 -0000	1.12
+++ .cvsignore	29 Sep 2006 03:05:58 -0000	1.13
@@ -1,2 +1,5 @@
 MesaDemos-6.5.1.tar.bz2
 MesaLib-6.5.1.tar.bz2
+gl-man-pages.tar.bz2
+glu-man-pages.tar.bz2
+glx-man-pages.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mesa.spec	25 Sep 2006 22:29:14 -0000	1.108
+++ mesa.spec	29 Sep 2006 03:05:58 -0000	1.109
@@ -53,6 +53,10 @@
 
 Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1.tar.bz2
 Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1.tar.bz2
+Source2: gl-man-pages.tar.bz2
+Source3: glu-man-pages.tar.bz2
+Source4: glx-man-pages.tar.bz2
+
 Source12: redhat-mesa-source-filelist-generator
 
 # Patches 0-9 reserved for mesa Makefiles/config fixes
@@ -232,7 +236,8 @@
 
 #-- prep -------------------------------------------------------------
 %prep
-%setup -q -n Mesa-%{version} -b1
+%setup -q -n Mesa-%{version} -b1 -b2 -b3 -b4
+
 # Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
 install -m 755 %{SOURCE12} ./
 
@@ -292,6 +297,22 @@
 done
 %endif
 
+# Install man pages, and build lists of the installed files
+pushd .
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+for y in gl-man-pages glu-man-pages glx-man-pages; do
+    cd ../$y
+    rm -f ../$y.lst
+    for x in `ls *.3gl`; do
+        gzip -c $x > $x.gz
+	echo $x.gz >> ../$y.lst
+        install -m 0644 $x.gz $RPM_BUILD_ROOT%{_mandir}/man3
+    done
+done
+cat ../glx-man-pages.lst >> ../gl-man-pages.lst
+rm -f ../glx-man-pages.lst
+popd
+
 # Run custom source filelist generator script, passing it a prefix
 %define mesa_source_filelist mesa-source-rpm-filelist.lst
 %define mesasourcedir %{_datadir}/mesa/source
@@ -325,7 +346,7 @@
 %{_libdir}/dri/*_dri.so
 %endif
 
-%files libGL-devel
+%files libGL-devel -f gl-man-pages.lst
 %defattr(-,root,root,-)
 %{_includedir}/GL/amesa.h
 %{_includedir}/GL/directfbgl.h
@@ -355,11 +376,12 @@
 %{_libdir}/libGLU.so.1
 %{_libdir}/libGLU.so.1.3.*
 
-%files libGLU-devel
+%files libGLU-devel -f glu-man-pages.lst
 %defattr(-,root,root,-)
 %{_libdir}/libGLU.so
 %{_includedir}/GL/glu.h
 %{_includedir}/GL/glu_mangle.h
+%{_mandir}/man3/*.3gl
 
 %files libOSMesa
 %defattr(-,root,root,-)
@@ -386,6 +408,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Thu Sep 28 2006 Soren Sandmann <sandmann at redhat.com> - 6.5.1-5.fc6
+- Add GL man pages from X R6.9.  (#184547)
+
 * Mon Sep 25 2006 Adam Jackson <ajackson at redhat.com> - 6.5.1-4.fc6
 - mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds.  (#207767)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Sep 2006 18:38:17 -0000	1.11
+++ sources	29 Sep 2006 03:05:58 -0000	1.12
@@ -1,2 +1,5 @@
 0f2794baf7a9d98b22caea9f78c6942d  MesaDemos-6.5.1.tar.bz2
 c46f2c6646a270911b791dd8e1c2d977  MesaLib-6.5.1.tar.bz2
+92e3fd47f3a8a50fdf51b454867271e3  gl-man-pages.tar.bz2
+73a8d5bc5fe2f336549b56ac3bf06911  glu-man-pages.tar.bz2
+f97e46b9f29dd64996c4408fbac5f8a3  glx-man-pages.tar.bz2