SPECS: X11.spec - rename include %{_lib} in ld.so.conf filename so...

glen glen at pld-linux.org
Tue Nov 1 18:55:07 CET 2005


Author: glen                         Date: Tue Nov  1 17:55:07 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename include %{_lib} in ld.so.conf filename so could install multiarch packages; rel 13

---- Files affected:
SPECS:
   X11.spec (1.159 -> 1.160) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.159 SPECS/X11.spec:1.160
--- SPECS/X11.spec:1.159	Sun Oct 30 13:12:25 2005
+++ SPECS/X11.spec	Tue Nov  1 18:55:01 2005
@@ -32,7 +32,7 @@
 Summary(zh_CN):	XOrg X11 ´°żÚϾͳˇţÎńĆ÷şÍťůąžłĚĐň
 Name:		X11
 Version:	6.8.2
-Release:	12
+Release:	13
 Epoch:		1
 License:	MIT/X Consortium/BSD (see README)
 Group:		X11
@@ -2163,7 +2163,7 @@
 gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
 
 install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-libs.conf
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -3016,7 +3016,7 @@
 
 %files libs
 %defattr(644,root,root,755)
-/etc/ld.so.conf.d/X11-libs.conf
+/etc/ld.so.conf.d/*.conf
 %dir %{_sysconfdir}/xdg
 %dir %{_themesdir}
 %dir %{_themesdir}/Default
@@ -3439,6 +3439,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2005/11/01 17:55:01  glen
+- rename include %{_lib} in ld.so.conf filename so could install multiarch packages; rel 13
+
 Revision 1.159  2005/10/30 12:12:25  qboosh
 - removed sparc64 from drivers not built there; propagated sparcv9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.159&r2=1.160&f=u




More information about the pld-cvs-commit mailing list