rpms/mksh/devel dot-mkshrc, NONE, 1.1 mksh.spec, 1.28, 1.29 sources, 1.21, 1.22
Robert Scheck
robert at fedoraproject.org
Sun Jul 11 18:57:31 UTC 2010
- Previous message: rpms/bluez/devel bluez.spec,1.118,1.119
- Next message: rpms/python-execnet/F-13 .cvsignore, 1.5, 1.6 import.log, 1.4, 1.5 python-execnet.spec, 1.4, 1.5 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: robert
Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5102
Modified Files:
mksh.spec sources
Added Files:
dot-mkshrc
Log Message:
- Added default configuration /etc/mkshrc & /etc/skel/.mkshrc
as default skel (like at bash; thanks to Michal Hlavinka)
- Corrected the license tag (thanks to Michal Hlavinka)
- Removed the arc4random.c file (upstream is phasing it out)
--- NEW FILE dot-mkshrc ---
# .mkshrc
# Source global definitions
if [ -f /etc/mkshrc ]; then
. /etc/mkshrc
fi
# User specific aliases and functions
Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mksh.spec 26 Feb 2010 23:21:58 -0000 1.28
+++ mksh.spec 11 Jul 2010 18:57:31 -0000 1.29
@@ -3,14 +3,15 @@
Summary: MirBSD enhanced version of the Korn Shell
Name: mksh
Version: 39c
-Release: 1%{?dist}
-License: MirOS
+Release: 2%{?dist}
+# BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest)
+License: MirOS and ISC and BSD
Group: System Environment/Shells
-URL: http://www.mirbsd.de/%{name}/
+URL: http://www.mirbsd.de/%{name}.htm
Source0: http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
-Source1: http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
+Source1: dot-mkshrc
Requires(post): grep
-Requires(postun): coreutils, grep
+Requires(postun): sed
BuildRequires: util-linux, ed
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +28,6 @@ bourne shell replacement, pdksh successo
# rpm.org has no support for *.cpio.gz
gzip -dc %{SOURCE0} | cpio -imd
mv %{name}/* . && rm -rf %{name}
-cp -f %{SOURCE1} .
%build
CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -combine
@@ -36,6 +36,8 @@ CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -
rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+install -D -p -m 644 dot.mkshrc $RPM_BUILD_ROOT%{_sysconfdir}/mkshrc
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mkshrc
%check
echo > test.wait
@@ -48,17 +50,12 @@ while test -e test.wait; do
done
%post
-if [ ! -f %{_sysconfdir}/shells ]; then
+grep -q "^%{_bindir}/%{name}$" %{_sysconfdir}/shells 2>/dev/null || \
echo "%{_bindir}/%{name}" >> %{_sysconfdir}/shells
-else
- grep -q "^%{_bindir}/%{name}$" %{_sysconfdir}/shells || \
- echo "%{_bindir}/%{name}" >> %{_sysconfdir}/shells
-fi
%postun
if [ ! -x %{_bindir}/%{name} ]; then
- grep -v "^%{_bindir}/%{name}$" %{_sysconfdir}/shells > %{_sysconfdir}/shells.rpm
- cat %{_sysconfdir}/shells.rpm > %{_sysconfdir}/shells && rm -f %{_sysconfdir}/shells.rpm
+ sed -e 's@^%{_bindir}/%{name}$@POSTUNREMOVE@' -e '/^POSTUNREMOVE$/d' -i %{_sysconfdir}/shells
fi
%clean
@@ -68,9 +65,17 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc dot.mkshrc
%{_bindir}/%{name}
+%config(noreplace) %{_sysconfdir}/mkshrc
+%config(noreplace) %{_sysconfdir}/skel/.mkshrc
%{_mandir}/man1/%{name}.1*
%changelog
+* Sun Jul 11 2010 Robert Scheck <robert at fedoraproject.org> 39c-2
+- Added default configuration /etc/mkshrc & /etc/skel/.mkshrc
+ as default skel (like at bash; thanks to Michal Hlavinka)
+- Corrected the license tag (thanks to Michal Hlavinka)
+- Removed the arc4random.c file (upstream is phasing it out)
+
* Sat Feb 27 2010 Robert Scheck <robert at fedoraproject.org> 39c-1
- Upgrade to 39c and updated arc4random.c file
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 26 Feb 2010 23:21:58 -0000 1.21
+++ sources 11 Jul 2010 18:57:31 -0000 1.22
@@ -1,2 +1 @@
0c3cd172b47eefcdf9a302baa42f5092 mksh-R39c.cpio.gz
-442f34c6c44a35d6d3daf393dcd4598a arc4random.c
- Previous message: rpms/bluez/devel bluez.spec,1.118,1.119
- Next message: rpms/python-execnet/F-13 .cvsignore, 1.5, 1.6 import.log, 1.4, 1.5 python-execnet.spec, 1.4, 1.5 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list