FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make the daily builds on OBS distinct from the releases"

Browse Source 
This reverts commit 7a7ce2c5e0a95b856ad5ac6a1eabe0750e722561.

Shouldn't have pushed that one :-)

The fix was to modify the spec file, not the name of the directory and tar
file.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-31 10:03:47 -08:00
parent 7a7ce2c5e0
commit 38278c9c71
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/ubuntu/make-package.sh
View File

@ -23,7 +23,7 @@ fi
rm -f subsurface-$VERSION
mkdir subsurface_$VERSION
ln -s subsurface_$VERSION subsurfacedaily-$VERSION
ln -s subsurface_$VERSION subsurface-$VERSION
#
#
echo "copying sources"
@ -39,7 +39,7 @@ echo $LIBDCREVISION > libdivecomputer/revision
#
echo "creating source tar file for OBS and Ununtu PPA"
#
(cd .. ; tar ch subsurfacedaily-$VERSION | xz > home:Subsurface-Divelog/Subsurface-daily/subsurfacedaily-$VERSION.orig.tar.xz) &
(cd .. ; tar ch subsurface-$VERSION | xz > home:Subsurface-Divelog/Subsurface-daily/subsurface-$VERSION.orig.tar.xz) &
tar cf - . | xz > ../subsurface_$VERSION.orig.tar.xz
#
#
@ -74,7 +74,7 @@ if [[ "$1x" = "postx" ]] ; then
dput ppa:subsurface/subsurface-daily subsurface_$VERSION*.changes
cd home:Subsurface-Divelog/Subsurface-daily
osc rm $(ls subsurface*.tar.xz | grep -v $VERSION)
osc add subsurfacedaily-$VERSION.orig.tar.xz
sed -i "s/%define gitVersion .*/%define gitVersion $GITREVISION/" subsurfacedaily.spec
osc add subsurface-$VERSION.orig.tar.xz
sed -i "s/%define gitVersion .*/%define gitVersion $GITREVISION/" subsurface.spec
osc commit -m "next daily build"
fi