From e48f108bba6fd4e521b830a83a53670255a92a05 Mon Sep 17 00:00:00 2001 From: twittner Date: Thu, 4 Aug 2005 21:01:38 +0000 Subject: [PATCH] - changed -more_readable.patch: check CHKCONFIG_ON / CHKCONFIG_OFF env. var. - if defined display their contents instead of "on" / "off" or their translation. - removed mr bcond - added CHKCONFIG_{ON,OFF} to /etc/env.d/ - rel. 11 Changed files: chkconfig.spec -> 1.64 --- chkconfig.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/chkconfig.spec b/chkconfig.spec index 969e6c6..8c35835 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,9 +1,3 @@ - -%bcond_with mr # Use asteriskes and dashes in all languages - # for `chkconfig --list` command (aplies more_readable.patch). - # Note: it makes the program inconsistent with the rest - # of the world (some people say). - Summary: Updates and queries runlevel information for system services Summary(de): Aktualisiert runlevel-Informationen für Systemdienste und fragt diese ab Summary(es): Herramienta para actualizar y listar servicios del sistema, por nivel de ejecución (runlevel) @@ -16,7 +10,7 @@ Summary(tr): Sistem servis bilgilerini sorgular ve yeniler Summary(uk): óÉÓÔÅÍÎÁ ÕÔÉ̦ÔÁ ÄÌÑ ËÅÒÕ×ÁÎÎÑ ¦¤ÒÁÒȦ¤À /etc/rc.d Name: chkconfig Version: 1.2.24h -Release: 10%{?with_mr:+mr} +Release: 11 Epoch: 1 License: GPL Group: Applications/System @@ -146,7 +140,7 @@ ntsysv - %patch2 -p1 %patch3 -p1 %patch4 -p1 -%{?with_mr:%patch5 -p1} +%patch5 -p1 mv -f po/{eu_ES,eu}.po mv -f po/{no,nb}.po @@ -164,7 +158,7 @@ mv -f po/{zh_CN.GB2312,zh_CN}.po %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/rc.d/{init,rc{0,1,2,3,4,5,6}}.d,/sbin} +install -d $RPM_BUILD_ROOT{/etc/{rc.d/{init,rc{0,1,2,3,4,5,6}}.d,env.d},/sbin} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -173,6 +167,15 @@ mv $RPM_BUILD_ROOT%{_sbindir}/chkconfig $RPM_BUILD_ROOT/sbin %find_lang %{name} +cat < $RPM_BUILD_ROOT/etc/env.d/CHKCONFIG_ON +# display custom string instead of "on" (or its translation) +#CHKCONFIG_ON="*****" +EOF +cat < $RPM_BUILD_ROOT/etc/env.d/CHKCONFIG_OFF +# display custom string instead of "off" (or its translation) +#CHKCONFIG_OFF="-----" +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -180,6 +183,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) /sbin/chkconfig %{_mandir}/man8/chkconfig.8* +%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) /etc/env.d/* %files -n ntsysv %defattr(644,root,root,755) -- 2.44.0