summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvcrhonek <vcrhonek@fedoraproject.org>2009-04-30 11:38:58 +0000
committervcrhonek <vcrhonek@fedoraproject.org>2009-04-30 11:38:58 +0000
commitf8b2e8b2e6adf9b5a1553e16f6c7526e4e4afd47 (patch)
treedbfa8b276e2dd1955dcf98ed50512ffe50b4942e
parent8b68f742bf4ba5218e807390dec2a4750ac29c3a (diff)
downloadtcsh-rebase-6.19.00-f8b2e8b2e6adf9b5a1553e16f6c7526e4e4afd47.tar.gz
tcsh-rebase-6.19.00-f8b2e8b2e6adf9b5a1553e16f6c7526e4e4afd47.tar.xz
tcsh-rebase-6.19.00-f8b2e8b2e6adf9b5a1553e16f6c7526e4e4afd47.zip
finish merge review fixes
-rw-r--r--tcsh.spec15
1 files changed, 8 insertions, 7 deletions
diff --git a/tcsh.spec b/tcsh.spec
index 0465258..8f6608c 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -48,8 +48,9 @@ like syntax.
%patch13 -p1 -b .rs-color
for i in Fixes WishList; do
- iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
- mv "${i}_" "$i"
+ iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
+ touch -r "$i" "${i}_" && \
+ mv "${i}_" "$i"
done
%build
@@ -95,12 +96,12 @@ rm -rf $RPM_BUILD_ROOT
%post
if [ ! -f /etc/shells ]; then
echo "%{_bindir}/tcsh" >> /etc/shells
- echo "%{_bindir}/csh" >> /etc/shells
+ echo "%{_bindir}/csh" >> /etc/shells
else
grep -q '^%{_bindir}/tcsh$' /etc/shells || \
echo "%{_bindir}/tcsh" >> /etc/shells
grep -q '^%{_bindir}/csh$' /etc/shells || \
- echo "%{_bindir}/csh" >> /etc/shells
+ echo "%{_bindir}/csh" >> /etc/shells
fi
%postun
@@ -111,18 +112,18 @@ if [ ! -x %{_bindir}/tcsh ]; then
fi
%files -f tcsh.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc BUGS FAQ Fixes NewThings WishList complete.tcsh
%{_bindir}/tcsh
%{_bindir}/csh
%{_mandir}/man1/*.1*
%changelog
-* Tue Apr 28 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.16-1
+* Thu Apr 30 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.16-1
- Update to tcsh-6.16.00
- Merge Review (fix License, add BUGS and WishList to documentation, convert Fixes and
WishList to UTF-8, remove root checking from buildroot cleaning, preserve timestamps,
- use smp_flags, remove unused patches and improve postun script)
+ use smp_flags, remove unused patches, improve postun script and minor fix to %%files)
Resolves: #226483
* Mon Mar 2 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.15-8