SPECS: pearize.sh - check optional-packages.txt specfile fragments...

glen glen at pld-linux.org
Sun Apr 2 13:46:27 CEST 2006


Author: glen                         Date: Sun Apr  2 11:46:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- check optional-packages.txt specfile fragments separately

---- Files affected:
SPECS:
   pearize.sh (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/pearize.sh
diff -u SPECS/pearize.sh:1.34 SPECS/pearize.sh:1.35
--- SPECS/pearize.sh:1.34	Mon Jan  9 14:20:38 2006
+++ SPECS/pearize.sh	Sun Apr  2 13:46:22 2006
@@ -121,7 +121,7 @@
 fi
 has_opt=$(egrep -c '^Optional-(pkg|ext):' $template || :)
 if [ "$has_opt" -gt 0 ]; then
-	if ! grep -q optional-packages.txt $spec; then
+	if ! grep -q '%{_docdir}/.*/optional-packages.txt' $spec; then
 		sed -i -e '
 		/^%clean/{
 			i%post
@@ -130,6 +130,10 @@
 			ifi
 			i
 		}
+		' $spec
+	fi
+	if ! grep -q '%doc.*optional-packages.txt' $spec; then
+		sed -i -e '
 		/^%doc install.log/{
 		s/$/ optional-packages.txt/
 		}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pearize.sh?r1=1.34&r2=1.35&f=u



More information about the pld-cvs-commit mailing list