rpms/mesa/devel .cvsignore, 1.13, 1.14 mesa.spec, 1.114, 1.115 sources, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Sep 30 18:04:36 UTC 2006
- Previous message (by thread): rpms/gaim/devel gaim.spec,1.136,1.137
- Next message (by thread): rpms/gcc/devel gcc41-power6x.patch, NONE, 1.1 gcc41-pr29154.patch, NONE, 1.1 gcc41-pr29198.patch, NONE, 1.1 gcc41-pr29272.patch, 1.1, 1.2 gcc41-tests.patch, 1.2, 1.3 gcc41.spec, 1.108, 1.109
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sandmann
Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19853
Modified Files:
.cvsignore mesa.spec sources
Log Message:
Use better tarball for man pages
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 29 Sep 2006 03:05:58 -0000 1.13
+++ .cvsignore 30 Sep 2006 18:04:34 -0000 1.14
@@ -3,3 +3,4 @@
gl-man-pages.tar.bz2
glu-man-pages.tar.bz2
glx-man-pages.tar.bz2
+gl-manpages-1.0.tar.bz2
Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mesa.spec 29 Sep 2006 19:07:15 -0000 1.114
+++ mesa.spec 30 Sep 2006 18:04:34 -0000 1.115
@@ -53,9 +53,7 @@
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
+Source2: gl-manpages-1.0.tar.bz2
Source12: redhat-mesa-source-filelist-generator
@@ -237,7 +235,7 @@
#-- prep -------------------------------------------------------------
%prep
-%setup -q -n Mesa-%{version} -b1 -b2 -b3 -b4
+%setup -q -n Mesa-%{version} -b1 -b2
# Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
install -m 755 %{SOURCE12} ./
@@ -278,6 +276,14 @@
ln -s libOSMesa16.so.6 %{_lib}/libOSMesa16.so
ln -s libOSMesa32.so.6 %{_lib}/libOSMesa32.so
+pushd .
+
+cd ../gl-manpages-1.0
+%configure
+make
+
+popd
+
#-- Install ----------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
@@ -305,19 +311,9 @@
# 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 %{_mandir}/man3/$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
+cd gl-manpages-1.0
+make install DESTDIR=$RPM_BUILD_ROOT
+popd .
# Run custom source filelist generator script, passing it a prefix
%define mesa_source_filelist mesa-source-rpm-filelist.lst
@@ -352,7 +348,7 @@
%{_libdir}/dri/*_dri.so
%endif
-%files libGL-devel -f ../gl-man-pages.lst
+%files libGL-devel
%defattr(-,root,root,-)
%{_includedir}/GL/amesa.h
%{_includedir}/GL/directfbgl.h
@@ -376,17 +372,20 @@
%{_includedir}/GL/xmesa_x.h
%{_includedir}/GL/xmesa_xf86.h
%{_libdir}/libGL.so
+%{_datadir}/man/man3/gl[^uX]*.3gl
+%{_datadir}/man/man3/glX*.3gl
%files libGLU
%defattr(-,root,root,-)
%{_libdir}/libGLU.so.1
%{_libdir}/libGLU.so.1.3.*
-%files libGLU-devel -f ../glu-man-pages.lst
+%files libGLU-devel
%defattr(-,root,root,-)
%{_libdir}/libGLU.so
%{_includedir}/GL/glu.h
%{_includedir}/GL/glu_mangle.h
+%{_datadir}/man/man3/glu*.3gl
%files libOSMesa
%defattr(-,root,root,-)
@@ -413,6 +412,9 @@
%{_bindir}/glxinfo
%changelog
+* Sat Sep 30 2006 Soren Sandmann <sandmann at redhat.com> - 6.5.1-7.fc6
+- Use better tarball for gl man pages. (#184547)
+
* Fri Sep 29 2006 Kristian <krh at redhat.com> - 6.5.1-6.fc6
- Add -fno-strict-aliasing to compiler flags for i965 driver.
- Add post-6.5.1-i965-fixes.patch backport of i965 fixes from mesa CVS.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 29 Sep 2006 03:05:58 -0000 1.12
+++ sources 30 Sep 2006 18:04:34 -0000 1.13
@@ -3,3 +3,4 @@
92e3fd47f3a8a50fdf51b454867271e3 gl-man-pages.tar.bz2
73a8d5bc5fe2f336549b56ac3bf06911 glu-man-pages.tar.bz2
f97e46b9f29dd64996c4408fbac5f8a3 glx-man-pages.tar.bz2
+841dd9ef3dec2f67a7faeb65bc5c78b8 gl-manpages-1.0.tar.bz2
- Previous message (by thread): rpms/gaim/devel gaim.spec,1.136,1.137
- Next message (by thread): rpms/gcc/devel gcc41-power6x.patch, NONE, 1.1 gcc41-pr29154.patch, NONE, 1.1 gcc41-pr29198.patch, NONE, 1.1 gcc41-pr29272.patch, 1.1, 1.2 gcc41-tests.patch, 1.2, 1.3 gcc41.spec, 1.108, 1.109
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list