SPECS (DEVEL): adapter.spec, adapter.awk - %useradd/%groupadd may ...

[glen]

Author: glen                         Date: Sun Oct  2 18:22:30 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- %useradd/%groupadd may not be continued with backslash

---- Files affected:
SPECS:
   adapter.spec (1.26.2.9 -> 1.26.2.10) , adapter.awk (1.189 -> 1.190) 

---- Diffs:

================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.26.2.9 SPECS/adapter.spec:1.26.2.10
--- SPECS/adapter.spec:1.26.2.9	Wed Sep  7 19:17:01 2005
+++ SPECS/adapter.spec	Sun Oct  2 20:22:24 2005
@@ -104,6 +104,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre base
+%groupadd -P %{name}-base -g 146 %{name}
+%useradd -P %{name}-base -u 146 -d /var/lib/%{name} \
+	-g %{name} -c "Eventum User" %{name}
+
 %post
 fix-info-dir
 
@@ -145,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26.2.10  2005/10/02 18:22:24  glen
+- %useradd/%groupadd may not be continued with backslash
+
 Revision 1.26.2.9  2005/09/07 17:17:01  glen
 - make use of macros (from commits list)
 

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.189 SPECS/adapter.awk:1.190
--- SPECS/adapter.awk:1.189	Fri Sep 30 12:13:22 2005
+++ SPECS/adapter.awk	Sun Oct  2 20:22:24 2005
@@ -416,7 +416,15 @@
 ###########
 /^%pre/, (/^%[a-z]+$/ && !/^%pre/) {
 	preamble = 0
+
+	# %useradd and %groupadd may not be wrapped
+	if (/%(useradd|groupadd).*\\$/) {
+		a = $0; getline;
+		sub(/^[\s\t]*/, "");
+		$0 = substr(a, 1, length(a) - 1) $0;
+	}
 }
+
 /^%post/, (/^%[a-z]+$/ && !/^%post/) {
 	preamble = 0
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.9&r2=1.26.2.10&f=u
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.189&r2=1.190&f=u