From 3fd1dc346f2b9310ecbdeed2c696121d05dfdc2b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 3 Dec 2013 21:49:43 +0100
Subject: prefer files in rpm/ subfolder, continue with next source file if we
 found a file here

---
 bin/build-rpm-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 387ad1f..804f52b 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -182,8 +182,8 @@ build_packages() {
 	sed -i $PROJECT.spec -e "s/%{?dist}/.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT%{?dist}/"
 
 	cat $PROJECT.spec | egrep "^Source[0-9]+:.*" | awk '{ print $2 }' | while read source_file; do
+		find $PROJECT/rpm/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/rpm/$source_file . && continue
 		find $PROJECT/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file .
-		find $PROJECT/rpm/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file .
 	done
 
 	mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION
-- 
cgit v1.2.3