SOURCES: mplayer-skins-generate.sh - preserve order of added sections

[glen]

Author: glen                         Date: Sat Oct  1 18:54:05 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- preserve order of added sections

---- Files affected:
SOURCES:
   mplayer-skins-generate.sh (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/mplayer-skins-generate.sh
diff -u SOURCES/mplayer-skins-generate.sh:1.3 SOURCES/mplayer-skins-generate.sh:1.4
--- SOURCES/mplayer-skins-generate.sh:1.3	Sat Oct  1 20:03:42 2005
+++ SOURCES/mplayer-skins-generate.sh	Sat Oct  1 20:53:59 2005
@@ -12,6 +12,16 @@
 rm -f .listing
 wget -r -np -nd -c "$url" --no-remove-listing
 
+add_spec_block() {
+	local block="$1"
+	sed -i -e "/NEW SKIN MARKER: $block/{
+		r $tmpf
+		a# NEW SKIN MARKER: $block
+		d
+	}
+	" $spec
+}
+
 add_skin() {
 	local file="$1"; shift
 	local skin="$1"; shift
@@ -38,8 +48,9 @@
 
 %description -n mplayer-skin- at skin@ -l pl
 Skórka @skin at .
+
 EOF
-	sed -i -e "/NEW SKIN MARKER: PREAMBLE/r $tmpf" $spec
+	add_spec_block PREAMBLE
 
 	# add %post
 	sed > $tmpf -e "
@@ -53,7 +64,7 @@
 fi
 
 EOF
-	sed -i -e "/NEW SKIN MARKER: POST/r $tmpf" $spec
+	add_spec_block POST
 
 	# add %files
 	sed > $tmpf -e "
@@ -61,12 +72,12 @@
 	s, at skin@,$skin,g
 	s, at version@,$version,g
 	" <<'EOF'
-
 %files -n mplayer-skin- at skin@
 %defattr(644,root,root,755)
 %{_skindir}/@skin@
+
 EOF
-	sed -i -e "/NEW SKIN MARKER: FILES/r $tmpf" $spec
+	add_spec_block FILES
 
 	# find free source nr
 	last=$(grep -o '^Source[0-9]\+' $spec | sed -s 's,^Source,,' | sort -n | tail -n 1)
@@ -87,9 +98,12 @@
 	" <<'EOF'
 @unpack@ | tar -x -C $RPM_BUILD_ROOT%{_skindir}
 EOF
-	sed -i -e "/NEW SKIN MARKER: UNPACK/r $tmpf" $spec
+	add_spec_block UNPACK
 
 	rm -f $tmpf
+
+	 # delete all leading blank lines at top of file
+	sed -i -e '/./,$!d' $spec
 }
 
 update_skin() {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mplayer-skins-generate.sh?r1=1.3&r2=1.4&f=u