Author: glen Date: Sun Nov 1 13:05:45 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- cosmetics
---- Files affected:
packages/glibc:
glibc.spec (1.843 -> 1.844)
---- Diffs:
================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.843 packages/glibc/glibc.spec:1.844
--- packages/glibc/glibc.spec:1.843 Sat Oct 31 18:28:39 2009
+++ packages/glibc/glibc.spec Sun Nov 1 14:05:40 2009
@@ -1006,16 +1006,16 @@
math/libm_pic.a libm.map
resolv/libresolv_pic.a"
-install $PICFILES $RPM_BUILD_ROOT%{_libdir}
-install elf/soinit.os
$RPM_BUILD_ROOT%{_libdir}/soinit.o
-install elf/sofini.os
$RPM_BUILD_ROOT%{_libdir}/sofini.o
+install -p $PICFILES $RPM_BUILD_ROOT%{_libdir}
+install -p elf/soinit.os
$RPM_BUILD_ROOT%{_libdir}/soinit.o
+install -p elf/sofini.os
$RPM_BUILD_ROOT%{_libdir}/sofini.o
# Include %{_libdir}/gconv/gconv-modules.cache
./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o
$RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
cd ..
%if %{without cross}
-install glibc-postinst $RPM_BUILD_ROOT/sbin
+install -p glibc-postinst $RPM_BUILD_ROOT/sbin
%endif
%{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so
$RPM_BUILD_ROOT%{_libdir}}
@@ -1037,13 +1037,13 @@
# linking nss modules directly is not supported
rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/nscd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/nscd
-install nscd/nscd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/nscd
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/nscd
+cp -a nscd/nscd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a posix/gai.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a nis/nss $RPM_BUILD_ROOT/etc/default/nss
sed -e 's#\([ \t]\)db\([ \t]\)#\1#g' nss/nsswitch.conf >
$RPM_BUILD_ROOT%{_sysconfdir}/nsswitch.conf
-install posix/gai.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install nis/nss $RPM_BUILD_ROOT/etc/default/nss
bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
@@ -1066,9 +1066,9 @@
install -d documentation
for f in ANNOUNCE ChangeLog DESIGN-{barrier,condvar,rwlock,sem}.txt
TODO{,-kernel,-testing}; do
- cp -f nptl/$f documentation/$f.nptl
+ cp -af nptl/$f documentation/$f.nptl
done
-cp -f crypt/README.ufc-crypt ChangeLog* documentation
+cp -af crypt/README.ufc-crypt ChangeLog* documentation
# Collect locale files and mark them with %%lang()
echo '%defattr(644,root,root,755)' > glibc.lang
@@ -1125,7 +1125,7 @@
if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
# use lang() tags with ll...@variant (stripping charset and
@quot|@boldquot)
- lang=`echo $i | sed -e 's/@quot\>\|@boldquot\>//'`
+ lang=$(echo $i | sed -e 's/@quot\>\|@boldquot\>//')
echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
fi
done
@@ -1187,12 +1187,14 @@
%useradd -P nscd -u 144 -r -d /tmp -s /bin/false -c "Name Service Cache
Daemon" -g nscd nscd
%post -n nscd
+if [ ! -f /var/log/nscd ]; then
+ umask 027
+ touch /var/log/nscd
+ chown root:root /var/log/nscd
+ chmod 640 /var/log/nscd
+fi
/sbin/chkconfig --add nscd
-touch /var/log/nscd
-chmod 000 /var/log/nscd
-chown root:root /var/log/nscd
-chmod 640 /var/log/nscd
-%service nscd restart "nscd daemon"
+%service nscd restart "Name Service Cache Daemon"
%preun -n nscd
if [ "$1" = "0" ]; then
@@ -1656,6 +1658,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.844 2009/11/01 13:05:40 glen
+- cosmetics
+
Revision 1.843 2009/10/31 17:28:39 arekm
- no old md5
@@ -1764,7 +1769,8 @@
- glibc-misc R: bash (at least ldd requires it)
Revision 1.810 2009/03/19 15:18:24 glen
-- breaking rpm dep loop: removed R: basesystem because no pkg should depend on
metapackage and reason added in r1.149 is no longer valid/needed; rel 6
+- breaking rpm dep loop: removed R: basesystem because no pkg should depend on
+ metapackage and reason added in r1.149 is no longer valid/needed; rel 6
Revision 1.809 2009/03/10 18:19:27 glen
- no need to regen gconv-modules.cache (which is void on 32bit multilib
anyway); rel 6
@@ -2054,7 +2060,7 @@
Revision 1.719 2007/10/10 20:26:36 arekm
- rel 3
-[require macros 1.396 not to strip libpthread]
+ [require macros 1.396 not to strip libpthread]
Revision 1.718 2007/08/24 16:21:18 qboosh
- reverted unnecessary ca_ES,uk_UA addition
@@ -2085,7 +2091,7 @@
- and sparc64 ppc64
Revision 1.709 2007/06/17 15:21:18 arekm
-rel 4; Provides/Obsoletes glibc64 makes only sense for x8664 architecture
+- rel 4; Provides/Obsoletes glibc64 makes only sense for x8664 architecture
Revision 1.708 2007/06/09 00:59:57 tommat
- added sparc64 ugly build patch from debian
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.843&r2=1.844&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
