Merge lp:~tplavcic/percona-toolkit/bld-114-2.2 into lp:percona-toolkit/2.2

Proposed by Tomislav Plavcic
Status: Needs review
Proposed branch: lp:~tplavcic/percona-toolkit/bld-114-2.2
Merge into: lp:percona-toolkit/2.2
Diff against target: 30 lines (+5/-2)
1 file modified
util/build-packages (+5/-2)
To merge this branch: bzr merge lp:~tplavcic/percona-toolkit/bld-114-2.2
Reviewer Review Type Date Requested Status
Percona Toolkit developers Pending
Review via email: mp+215847@code.launchpad.net

Description of the change

Added creation of source rpms next to "binary" rpm.
This was requested for some customer (see BLD-114 for info).

To post a comment you must log in.
597. By Tomislav Plavcic

Added creation of source RPM package

Unmerged revisions

597. By Tomislav Plavcic

Added creation of source RPM package

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'util/build-packages'
2--- util/build-packages 2013-12-18 23:21:07 +0000
3+++ util/build-packages 2014-04-15 14:05:10 +0000
4@@ -358,12 +358,12 @@
5 fi
6
7 mkdir -p rpm rpm/BUILD rpm/SOURCES rpm/RPMS rpm/SRPMS
8- mkdir -p RPM
9+ mkdir -p RPM SRPMS
10 cd rpm
11 local topdir=`pwd`
12
13 # Build RPM package from the tarball.
14- rpmbuild -bb --clean $RPM_CONFIG_DIR/percona-toolkit.spec \
15+ rpmbuild -ba --clean $RPM_CONFIG_DIR/percona-toolkit.spec \
16 --quiet \
17 --define "_topdir $PWD" \
18 --define "_sourcedir $RELEASE_DIR" \
19@@ -375,8 +375,11 @@
20
21 if [ ! -f "RPMS/noarch/$PKG-1.noarch.rpm" ]; then
22 die "RPMS/noarch/$PKG-1.noarch.rpm did not build"
23+ elif [ ! -f "SRPMS/$PKG-1.src.rpm" ]; then
24+ die "SRPMS/$PKG-1.src.rpm did not build"
25 fi
26 mv "RPMS/noarch/$PKG-1.noarch.rpm" $RELEASE_DIR/RPM
27+ mv "SRPMS/$PKG-1.src.rpm" $RELEASE_DIR/SRPMS
28 rm -rf $RELEASE_DIR/rpm
29
30 echo "OK"

Subscribers

People subscribed via source and target branches