]> TLD Linux GIT Repositories - packages/rpm-build-tools.git/commitdiff
- fix systemd exclude check regex
authorMarcin Krol <hawk@tld-linux.org>
Sun, 9 May 2021 16:57:59 +0000 (18:57 +0200)
committerMarcin Krol <hawk@tld-linux.org>
Sun, 9 May 2021 16:57:59 +0000 (18:57 +0200)
builder.sh

index a5b8edc233598c0ddd26de77c09cb6baa916ba6e..587d275c9ba413f0770529a01c0d846a1c6613c0 100755 (executable)
@@ -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