]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
- check optional-packages.txt specfile fragments separately
authorElan Ruusamäe <glen@pld-linux.org>
Sun, 2 Apr 2006 11:46:22 +0000 (11:46 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    pearize.sh -> 1.35

pearize.sh

index 1ddfd246efe52b47f55178686dee4e1fa6c94e35..c988e6fa60fcc68db42b60e73dafe3941918fc2c 100644 (file)
@@ -121,7 +121,7 @@ if [ -n "$optional" ]; then
 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 @@ if [ "$has_opt" -gt 0 ]; then
                        ifi
                        i
                }
+               ' $spec
+       fi
+       if ! grep -q '%doc.*optional-packages.txt' $spec; then
+               sed -i -e '
                /^%doc install.log/{
                s/$/ optional-packages.txt/
                }
This page took 0.0453 seconds and 4 git commands to generate.