Author: glen Date: Sun Mar 19 18:14:19 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use /etc/ld.so.conf.d, rel 12
---- Files affected: SPECS: XFree86.spec (1.618 -> 1.619) ---- Diffs: ================================================================ Index: SPECS/XFree86.spec diff -u SPECS/XFree86.spec:1.618 SPECS/XFree86.spec:1.619 --- SPECS/XFree86.spec:1.618 Sun Mar 19 18:50:57 2006 +++ SPECS/XFree86.spec Sun Mar 19 19:14:13 2006 @@ -21,7 +21,7 @@ Summary(zh_CN): XFree86 ´°żÚϾͳˇţÎńĆ÷şÍťůąžłĚĐň Name: XFree86 Version: 4.4.0 -Release: 11 +Release: 12 Epoch: 1 License: XFree86 1.1 Group: X11 @@ -1310,10 +1310,8 @@ Summary(ru): ňÁÚÄĹĚŃĹÍŮĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ X Window System (X11R6.4) Summary(uk): âŚÂĚŚĎÔĹËÉ ÓĐŚĚŘÎĎÇĎ ×ÉËĎŇÉÓÔÁÎÎŃ ÄĚŃ X Window System (X11R6.4) Group: X11/Libraries -Requires(post,postun): /sbin/ldconfig -Requires(post,postun): grep -Requires(postun): fileutils Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: glibc >= 6:2.3.5-7.6 Provides: xcursor = 1.0 Provides: xft = 2.1.0 Provides: xpm @@ -1997,6 +1995,9 @@ gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.* %endif +install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d +echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_lib}.conf + # kill some stuff for cleaner build # (fontconfig packaged separately, DRM already in kernel) rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontconfig.pc \ @@ -2010,7 +2011,7 @@ %clean rm -rf $RPM_BUILD_ROOT -#--- %post{un}, %preun, %verifyscript, %trigge ---------- +#--- %post{un}, %preun, %trigger ---------- %post DPS -p /sbin/ldconfig %postun DPS -p /sbin/ldconfig @@ -2021,28 +2022,8 @@ %post OpenGL-libs -p /sbin/ldconfig %postun OpenGL-libs -p /sbin/ldconfig -%post libs -umask 022 -grep -qs "^%{_libdir}$" /etc/ld.so.conf -[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf -/sbin/ldconfig - -%postun libs -if [ "$1" = "0" ]; then - umask 022 - grep -v "%{_libdir}" /etc/ld.so.conf > /etc/ld.so.conf.new - mv -f /etc/ld.so.conf.new /etc/ld.so.conf -fi -/sbin/ldconfig - -%verifyscript libs -echo -n "Looking for %{_libdir} in /etc/ld.so.conf... " -if ! grep -q "^%{_libdir}$" /etc/ld.so.conf ; then - echo "missing" - echo "%{_libdir} missing from /etc/ld.so.conf" >&2 -else - echo "found" -fi +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %pre modules if [ -d /etc/X11/xkb/geometry/hp ]; then @@ -2055,6 +2036,9 @@ ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb fi +%triggerpostun libs -- XFree86-libs < 1:4.4.0-12 +sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf + %post xdm /sbin/chkconfig --add xdm if [ -f /var/lock/subsys/xdm ]; then @@ -2819,7 +2803,8 @@ %files libs %defattr(644,root,root,755) -%dir /etc/xdg +/etc/ld.so.conf.d/*.conf +%dir %{_sysconfdir}/xdg %dir %{_themesdir} %dir %{_themesdir}/Default %dir %{_themesdir}/ThinIce @@ -3220,6 +3205,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.619 2006/03/19 18:14:13 glen +- use /etc/ld.so.conf.d, rel 12 + Revision 1.618 2006/03/19 17:50:57 glen - use %service ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/XFree86.spec?r1=1.618&r2=1.619&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit