summaryrefslogtreecommitdiff
path: root/bin/build-rpm-package
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-03 21:49:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-03 21:49:43 +0100
commit3fd1dc346f2b9310ecbdeed2c696121d05dfdc2b (patch)
treeb2352c2d76796bdf93c3e4ce8e09b9a1b9852329 /bin/build-rpm-package
parent097ee18b3a57ad5a414646a84e84bc70d4558de1 (diff)
downloadbuildscripts-3fd1dc346f2b9310ecbdeed2c696121d05dfdc2b.tar.gz
buildscripts-3fd1dc346f2b9310ecbdeed2c696121d05dfdc2b.tar.bz2
buildscripts-3fd1dc346f2b9310ecbdeed2c696121d05dfdc2b.zip
prefer files in rpm/ subfolder, continue with next source file if we found a file here
Diffstat (limited to 'bin/build-rpm-package')
-rwxr-xr-xbin/build-rpm-package2
1 files changed, 1 insertions, 1 deletions
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