rpms/mesa/devel mesa.spec,1.168,1.169
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Tue Feb 26 20:42:30 UTC 2008
Author: ajax
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2437
Modified Files:
mesa.spec
Log Message:
* Tue Feb 26 2008 Adam Jackson <ajax at redhat.com> 7.1-0.17
- Fix OSMesa symlink bug. (#424545)
- Build OSMesa with -Os to be slightly less bloaty.
- Re-add osmesa.h to libOSMesa-devel.
- Really restore -fvisibility=hidden.
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- mesa.spec 21 Feb 2008 20:05:41 -0000 1.168
+++ mesa.spec 26 Feb 2008 20:41:53 -0000 1.169
@@ -15,7 +15,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.1
-Release: 0.16%{?dist}
+Release: 0.17%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -163,10 +163,11 @@
sed -i 's,terrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/terrain.c
%build
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"
autoreconf --install
+export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
+export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
# first, build the osmesa variants
%configure --with-driver=osmesa --with-osmesa-bits=8
make %{_smp_mflags} SRC_DIRS=mesa
@@ -186,6 +187,9 @@
# just to be sure...
[ `find . -name \*.o | wc -l` -eq 0 ] || exit "make cleaner plz"
+export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"
+export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"
+
# now build the rest of mesa
%configure \
--disable-glw \
@@ -237,12 +241,7 @@
install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
# and osmesa
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} osmesa*/*.so.?
-pushd $RPM_BUILD_ROOT%{_libdir}
-for i in libOSMesa* ; do
- ln -s $i $(basename $i .6)
-done
-popd
+mv osmesa*/* $RPM_BUILD_ROOT%{_libdir}
# man pages
pushd ../%{manpages}
@@ -316,9 +315,9 @@
%files libOSMesa
%defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.6
-%{_libdir}/libOSMesa16.so.6
-%{_libdir}/libOSMesa32.so.6
+%{_libdir}/libOSMesa.so.6*
+%{_libdir}/libOSMesa16.so.6*
+%{_libdir}/libOSMesa32.so.6*
%files libOSMesa-devel
%defattr(-,root,root,-)
@@ -394,6 +393,12 @@
%{_libdir}/mesa-demos-data
%changelog
+* Tue Feb 26 2008 Adam Jackson <ajax at redhat.com> 7.1-0.17
+- Fix OSMesa symlink bug. (#424545)
+- Build OSMesa with -Os to be slightly less bloaty.
+- Re-add osmesa.h to libOSMesa-devel.
+- Really restore -fvisibility=hidden.
+
* Thu Feb 21 2008 Adam Jackson <ajax at redhat.com> 7.1-0.16
- Fix build on powerpc and amd64.
- Disable %%_smp_mflags for DRI drivers for now.
More information about the fedora-extras-commits
mailing list