rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 74023 from home:a_jaeger:branches:openSUSE:Factory

Browse Source 
Cleanup ld.so.conf list, kde dirs are moved to kdelibs3 (bnc#671725)

OBS-URL: https://build.opensuse.org/request/show/74023
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=65
This commit is contained in:
Andreas Jaeger 2011-06-17 11:07:37 +00:00 committed by Git OBS Bridge
parent 5f7e76b123
commit e66122a78d
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glibc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 17 09:50:19 UTC 2011 - aj@suse.de
- Cleanup ld.so.conf list, move kde directories to
kdelibs3 (bnc#671725).
-------------------------------------------------------------------
Fri Jun 17 07:07:37 UTC 2011 - aj@suse.de

28
glibc.spec
View File

@ -799,30 +799,22 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
# Create ld.so.conf
#
cat > $RPM_BUILD_ROOT/etc/ld.so.conf <<EOF
/usr/%{_lib}/Xaw3d
%ifarch s390x sparc64 x86_64 ppc64 ppc
/usr/lib64/Xaw3d
%endif
/usr/lib/Xaw3d
%ifarch %x86
/usr/i586-suse-linux/lib
%else
%ifarch ppc ppc64
/usr/powerpc-suse-linux/lib
/usr/powerpc64-suse-linux/lib
%else
/usr/$RPM_ARCH-suse-linux/lib
%endif
%endif
/usr/local/%{_lib}
%ifarch s390x sparc64 x86_64 ppc64 ppc
/lib64
/lib
/usr/lib64
/usr/lib
/usr/local/lib64
/usr/local/lib
/opt/kde3/lib64
%endif
/opt/kde3/lib
/%{_lib}
%ifarch s390x sparc64 x86_64 ppc64 ppc
/lib
%endif
/usr/%{_lib}
%ifarch s390x sparc64 x86_64 ppc64 ppc
/usr/lib
%endif
include /etc/ld.so.conf.d/*.conf
EOF
# Add ldconfig cache directory for directory ownership