- fix systemd exclude check regex

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 79d7219ca7fa3f20bdbaab2f0f5d91439eb39f9a..587d275c9ba413f0770529a01c0d846a1c6613c0 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -891,9 +891,9 @@ Exit_error() {
                        remove_build_requires
                        echo >&2 "Error: couldn't get out package name/version/release from spec file."
                        exit 6 ;;
-               "err_tag_exists" )
+               "err_pkgrev_exists" )
                        remove_build_requires
-                       echo >&2 "Tag ${2} already exists"
+                       echo >&2 "Error: package revision ${2} already exists"
                        exit 9 ;;
                "err_fract_rel" )
                        remove_build_requires
@@ -1505,7 +1505,7 @@ set_pkgrev() {
        rm $_tmp 2>/dev/null
        [ "$(get_pkgrev "$_tag")" = "$CVSTAG" ] && return 0
        echo "$result" | grep -q -E "^OK$" && return 0
-       echo "$result" | grep -q -E "^EXISTS$" && Exit_error err_tag_exists "$_tag"
+       echo "$result" | grep -q -E "^EXISTS$" && Exit_error err_pkgrev_exists "$_tag"
        Exit_error err_pkgrev_set
 }
 
@@ -1688,7 +1688,7 @@ build_package() {
        local specdir=$(insert_gitlog $SPECFILE)
        ulimit -c unlimited
        # If required exclude directories with systemd related files from package contents
-       if grep -q -E 'systemd(unitdir|userunitdir|tmpfilesdir)' $specdir/$SPECFILE; then
+       if grep -q -E '(lib/(systemd|tmpfiles.d)|systemd(unitdir|userunitdir|tmpfilesdir))' $specdir/$SPECFILE; then
                sed -i -e '/^%exclude_systemd_files/d; /^%files/s/$/\n%exclude_systemd_files/g;' $specdir/$SPECFILE
        fi
        # Enable/disable distro wide bconds based on ~/.distbcond