diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-09-06 12:18:25 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-09-06 12:18:25 +0200 |
| commit | e1b0f9853e54b14a21c49f05742d3affd2282872 (patch) | |
| tree | 5e9cc4e096641eb91dbfb8df6b477d125af40f94 | |
| parent | b58a4c7e4165c301056fde880b94faea4e277042 (diff) | |
| download | glibc-e1b0f9853e54b14a21c49f05742d3affd2282872.tar.gz glibc-e1b0f9853e54b14a21c49f05742d3affd2282872.tar.xz glibc-e1b0f9853e54b14a21c49f05742d3affd2282872.zip | |
Remove or don't install unpackaged files for auxarches
| -rw-r--r-- | fedora/glibc.spec.in | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 350317ba32..fb43e6b891 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -505,17 +505,15 @@ ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a install -p -m 644 fedora/nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf +%ifnarch %{auxarches} mkdir -p $RPM_BUILD_ROOT/etc/default install -p -m 644 nis/nss $RPM_BUILD_ROOT/etc/default/nss -# Take care of setuids -# -- new security review sez that this shouldn't be needed anymore -#chmod 755 $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown - # This is for ncsd - in glibc 2.2 install -m 644 nscd/nscd.conf $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d install -m 755 nscd/nscd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd +%endif # Don't include ld.so.cache rm -f $RPM_BUILD_ROOT/etc/ld.so.cache @@ -525,9 +523,11 @@ echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT/etc/ld.so.conf > $RPM_BUILD_ROOT/etc/ld.so.cache chmod 644 $RPM_BUILD_ROOT/etc/ld.so.conf mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d +%ifnarch %{auxarches} mkdir -p $RPM_BUILD_ROOT/etc/sysconfig > $RPM_BUILD_ROOT/etc/sysconfig/nscd > $RPM_BUILD_ROOT/etc/gai.conf +%endif # Include %{_prefix}/%{_lib}/gconv/gconv-modules.cache > $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache @@ -639,8 +639,6 @@ sed -i -e '\|%{_prefix}/%{_lib}/lib.*\.a|d' \ -e '\|nscd|d' rpm.filelist grep '%{_prefix}/bin' < rpm.filelist >> common.filelist -#grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist -#grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist grep '%{_prefix}/share' < rpm.filelist | \ grep -v -e '%{_prefix}/share/zoneinfo' -e '%%dir %{prefix}/share' \ @@ -829,19 +827,9 @@ egrep "$auxarches_debugsources" debuginfocommon.sources >> debuginfo.filelist egrep -v "$auxarches_debugsources" \ debuginfocommon.sources >> debuginfocommon.filelist -%ifnarch %{auxarches} -# non-aux arches when there is a debuginfo-common -# all the sources go into debuginfo-common -#cat debuginfocommon.sources >> debuginfocommon.filelist -%endif list_debug_archives >> debuginfocommon.filelist -%else - -# already found by find-debuginfo -#list_debug_archives >> debuginfo.filelist - %endif %endif @@ -856,6 +844,7 @@ sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \ common.filelist devel.filelist static.filelist headers.filelist \ utils.filelist nscd.filelist debuginfocommon.filelist | (cd $RPM_BUILD_ROOT; xargs --no-run-if-empty rm -f 2> /dev/null || :) +rm -f $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown %else |