Author: glen Date: Tue Nov 7 06:12:42 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - also get rid of find + cosmetics
---- Files affected: SPECS: man.spec (1.134 -> 1.135) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.134 SPECS/man.spec:1.135 --- SPECS/man.spec:1.134 Tue Nov 7 05:10:02 2006 +++ SPECS/man.spec Tue Nov 7 07:12:36 2006 @@ -13,7 +13,7 @@ Summary(uk): îÁÂŚŇ ŐÔÉĚŚÔ ÄĚŃ ÄĎËŐÍĹÎÔÁĂŚ§: man, apropos ÔÁ whatis Name: man Version: 1.6d -Release: 3.1 +Release: 3.3 License: GPL Group: Applications/System Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz @@ -234,7 +234,7 @@ mv $i ${i%man.conf.man}man.config.man done -for src in $(find msgs -type f -name 'mess.[a-z][a-z]'); do +for src in msgs/mess.[a-z][a-z]; do lang=${src##*.} case ${lang} in ja) charset=euc-jp ;; @@ -266,7 +266,7 @@ done # use gzip (not bzip2) to compress formatted man pages -sed -i -e 's/compress=$/compress=gzip/' configure +%{__sed} -i -e 's/compress=$/compress=gzip/' configure cat << 'EOF' > apache.conf ScriptAlias /cgi-bin/man %{_cgibinmandir} @@ -283,7 +283,7 @@ -confdir %{_sysconfdir} # HACK: Make output default to using -c; otherwise it appears broken. -perl -pi -e "s/nroff /nroff -c /" conf_script +%{__sed} -i -e 's/nroff /nroff -c /' conf_script %{__make} \ BUILD_CC="%{__cc} %{rpmcflags} %{rpmldflags}" \ @@ -295,9 +295,9 @@ install -d $RPM_BUILD_ROOT{/etc/cron.{daily,weekly},%{_bindir},%{_mandir},%{_sbindir},%{_cgibinmandir},%{_cgiauxmandir}} \ $RPM_BUILD_ROOT{%{_mandir}/{hu,ja,ko}/man{1,5,8},%{_webappdir},/etc/tmpwatch} -echo "# Cleanup man temporary files:" > $RPM_BUILD_ROOT/etc/tmpwatch/man.conf -echo '%defattr(644,root,root,755)' > man.lang -for i in "" bg cs da de el es fi fr gl hr hu id it ja ko nl pl pt pt_BR ro ru \ +echo '# Cleanup man temporary files:' > $RPM_BUILD_ROOT/etc/tmpwatch/man.conf +> man.lang +for i in '' bg cs da de el es fi fr gl hr hu id it ja ko nl pl pt pt_BR ro ru \ sk sl sr sv tr uk zh_CN zh_TW; do if [ "$i" ]; then lng="%lang($i) " @@ -305,11 +305,11 @@ else lng="" fi - for cdir in "" /local /X11R6 ; do + for cdir in '' /local /X11R6 ; do install -d $RPM_BUILD_ROOT/var/cache/man${cdir}$i/cat{1,2,3,4,5,6,7,8,9,n} echo "/var/cache/man${cdir}$i 240" >> $RPM_BUILD_ROOT/etc/tmpwatch/man.conf echo "${lng}%dir /var/cache/man${cdir}$i" >> man.lang - echo "${lng}%attr(775,root, man) /var/cache/man${cdir}$i/cat[1-9n]" >> man.lang + echo "${lng}%attr(775,root,man) /var/cache/man${cdir}$i/cat[1-9n]" >> man.lang done done @@ -320,7 +320,7 @@ PREFIX="$RPM_BUILD_ROOT" dir=$RPM_BUILD_ROOT%{_mandir} -for src in $(find man -type f -name '*.[1-9n]'); do +for src in man/{*/,}*/*.[1-9n]; do # src is like: man/nl/man.config.5 or man/pl/man1/man2html.1 noman=${src#*/} lang=${noman%%%%/*} @@ -586,6 +586,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.135 2006/11/07 06:12:36 glen +- also get rid of find + cosmetics + Revision 1.134 2006/11/07 04:10:02 sparky - use case...esac and get rid of sed, basename - much faster and readable ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.134&r2=1.135&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
