From 92e634123cd79a8c484fcaae2674a6c5ef77771a Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Apr 11 2023 11:52:45 +0000
Subject: Merge branch 'packaging' into master


---

diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh
index 357692a..d18aa1f 100755
--- a/scripts/run_oldconfig.sh
+++ b/scripts/run_oldconfig.sh
@@ -254,6 +254,9 @@ scripts="${prefix}scripts"
 if test -e "${prefix}rpm/config.sh"; then
 	source "$_"
 fi
+if [ "$VARIANT" = "-vanilla" ] ; then
+    VANILLA_ONLY=1
+fi
 if test -z "$set_flavor" && test "$VANILLA_ONLY" = 1 -o -e .is_vanilla; then
 	set_flavor=vanilla
 fi
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index 2ea9a1a..01f5d03 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -191,7 +191,7 @@ CLEANFILES=()
 trap 'if test -n "$CLEANFILES"; then rm -rf "${CLEANFILES[@]}"; fi' EXIT
 tmpdir=$(mktemp -dt ${0##*/}.XXXXXX)
 CLEANFILES=("${CLEANFILES[@]}" "$tmpdir")
-rpmfiles=$(ls rpm/* | grep -v "~$")
+rpmfiles=$(ls -d rpm/* | grep -v -e "~$" -e "[.]orig$" -e "[.]rej$" | { while read x ; do [ -d "$x" ] || echo "$x" ; done ; } )
 rpmstatus=$(for i in $rpmfiles ; do git status -s $i ; done)
 [ -z "$rpmstatus" ] || { inconsistent=true ; echo "$rpmstatus" ; }