Author: baggins Date: Fri Sep 28 22:44:09 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added multigl bcond (see bcond comment)
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.111 -> 1.112)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.111
SPECS/xorg-xserver-server.spec:1.112
--- SPECS/xorg-xserver-server.spec:1.111 Sat Sep 15 11:26:41 2007
+++ SPECS/xorg-xserver-server.spec Sat Sep 29 00:44:04 2007
@@ -7,6 +7,10 @@
%define xorg_xserver_server_videodrv_abi 2.0
%define xorg_xserver_server_xinput_abi 2.0
+#
+# Conditional build:
+%bcond_with multigl # package libglx.so in a way allowing
concurrent install with nvidia/fglrx drivers
+
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
@@ -364,6 +368,12 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
+%if %{with multigl}
+cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
+mv -f libglx.so libglx.so.%{version}
+ln -sf libglx.so.%{version} libglx.so
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -473,7 +483,12 @@
%files -n xorg-xserver-libglx
%defattr(644,root,root,755)
+%if %{with multigl}
+%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version}
+%else
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -481,6 +496,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.112 2007/09/28 22:44:04 baggins
+- added multigl bcond (see bcond comment)
+
Revision 1.111 2007/09/15 09:26:41 adamg
- CVE entry for rel 1.92 (ver. 1.4)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.111&r2=1.112&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
