SPECS: chkconfig.spec - changed -more_readable.patch: check CHKCON...

[twittner]

Author: twittner                     Date: Thu Aug  4 21:01:43 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 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

---- Files affected:
SPECS:
   chkconfig.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/chkconfig.spec
diff -u SPECS/chkconfig.spec:1.63 SPECS/chkconfig.spec:1.64
--- SPECS/chkconfig.spec:1.63	Sat Sep 25 13:20:51 2004
+++ SPECS/chkconfig.spec	Thu Aug  4 23:01:38 2005
@@ -1,10 +1,4 @@
 # $Revision$, $Date$
-
-%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)
@@ -17,7 +11,7 @@
 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
@@ -147,7 +141,7 @@
 %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
@@ -165,7 +159,7 @@
 
 %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
@@ -174,6 +168,15 @@
 
 %find_lang %{name}
 
+cat <<EOF > $RPM_BUILD_ROOT/etc/env.d/CHKCONFIG_ON
+# display custom string instead of "on" (or its translation)
+#CHKCONFIG_ON="*****"
+EOF
+cat <<EOF > $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
 
@@ -181,6 +184,7 @@
 %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)
@@ -193,6 +197,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2005/08/04 21:01:38  twittner
+- 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
+
 Revision 1.63  2004/09/25 11:20:51  radek
 - cosmetics (spaces -> tabs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/chkconfig.spec?r1=1.63&r2=1.64&f=u