Dimitar Zhekov <jimmy@is-vn.bg>:

It's OK to have the package selection rules in the main
menu when you only have several of them. But for precise
selections (20+ rules) this is unhandy.


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1384 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -4,7 +4,7 @@
  - Alejandro Mery: fixed ncurses/zlib to install into /, fixed ncompress
                    download location and updated smartmontools
  - updated exim and spamassassin
- - Dimitar Zhekov: linux config style fixes
+ - Dimitar Zhekov: linux config style fixes, pkgsel rules in submenu
 
 *) 2003-09-12 (2.0.0-rc1 - 2.0.0-rc2)
 

scripts/config.hlp

@@ -148,10 +148,13 @@ ROCKCFG_PKGFILE_VER
   package filenme.
 
 ROCKCFG_PKGSEL
+  If selected you can modify the package list for the build.
+
+MENU_PKGSEL_RULES
   Here you can modify the package list for the build. You have the
   choice beween enable, disable or complete removal. A disabled
-  package can still be reenabled by a target where are removed
-  package can not be selected by a target.
+  package can still be reenabled by a target, while a removed one
+  can not be selected by a target.
 
   Use "X <pattern>" to enable  packages
   Use "O <pattern>" to disable packages

scripts/config.in

@@ -227,7 +227,7 @@ expert_begin
       fi
       bool 'Custom package selection' ROCKCFG_PKGSEL 0
       if [ "$ROCKCFG_PKGSEL" = 1 ] ; then
-	block_begin 3
+	menu_begin MENU_PKGSEL_RULES 'Edit package selection rules'
 		# Active error checking: explicitly show an annoying popup
 		filter=`printf "^[-xXoO][ \t]\+[a-zA-Z0-9_/*+.-]"`
 		if grep -lvq "$filter" config/$config/pkgsel 2> /dev/null && \
@@ -284,7 +284,7 @@ expert_begin
 			rm -f config/$config/packages.new
 			comment '----    Syntax error(s) in rule set!'
 		fi
-	block_end
+	menu_end
       else
 	rm -f config/$config/pkgsel
 	rm -f config/$config/pkgsel.awk