diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-08 12:17:00 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-08 12:17:00 +0100 |
| commit | f4a5a4df70c61729da30c7d5f0dfff69fe8e1068 (patch) | |
| tree | d88f73b2ddf13cbf59921a44e366f7dbdaa076e7 | |
| parent | 82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8 (diff) | |
| download | buildscripts-f4a5a4df70c61729da30c7d5f0dfff69fe8e1068.tar.gz buildscripts-f4a5a4df70c61729da30c7d5f0dfff69fe8e1068.tar.bz2 buildscripts-f4a5a4df70c61729da30c7d5f0dfff69fe8e1068.zip | |
fix inclusion of Source: files
| -rwxr-xr-x | bin/build-rpm-package | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 93f6eb9..e607dfb 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -142,8 +142,7 @@ clear_pkgdist() { for l_ARCH in x86_64 i386; do if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - #rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" - rm -f "$PKGDIST/rpmbuild/SOURCES/$PROJECT-"*.tar.gz + rm -f "$PKGDIST/rpmbuild/SOURCES/* rm -f "$PKGDIST/rpmbuild/SRPMS/$PROJECT-"*.src.rpm rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm @@ -189,8 +188,8 @@ build_packages() { fi cat $PROJECT.spec | egrep "^Source[1-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/rpm/$source_file $PKGDIST/rpmbuild/SOURCES/ && continue + find $PROJECT/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file $PKGDIST/rpmbuild/SOURCES/ done mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION |