diff options
| author | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-11 14:25:06 (GMT) |
|---|---|---|
| committer | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-11 14:25:06 (GMT) |
| commit | 53abd4b87df54ff759fc26ab3b0f9601b4b2a546 (patch) | |
| tree | 3d42428ecc705895d5f653c101ad8f4481bdfbc3 | |
| parent | d5c250f42dd763ff3989189e703d2be089d49800 (diff) | |
| parent | 7320153845e916cfb1d592272c1c15293fc3e3b7 (diff) | |
Merge branch 'bleeding-edge' into AU
| -rw-r--r-- | rpms/buildrpm.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rpms/buildrpm.sh b/rpms/buildrpm.sh index 1b935e2..5e72ae5 100644 --- a/rpms/buildrpm.sh +++ b/rpms/buildrpm.sh @@ -20,8 +20,6 @@ # This script builds Dextrose patched, Sugar rpms from git repositories # Requirements: git, yum-utils, rpmbuild, patch, libtool, intltool, createrepo -set -e - if [ $# != 2 ] then echo Usage: sh $0 version package @@ -45,7 +43,7 @@ mkdir -p ~/rpmbuild/BUILD ~/rpmbuild/BUILDROOT ~/rpmbuild/RPMS ~/rpmbuild/SOURCE cp $PACKAGE/$PACKAGE.spec ~/rpmbuild/SPECS/$PACKAGE/ -[ -f $PACKAGE/macros.$PACKAGE ] && cp $PACKAGE/macros.$PACKAGE ~/rpmbuild/SOURCES/ +[ $PACKAGE = "sugar-toolkit" ] && cp $PACKAGE/macros.sugar ~/rpmbuild/SOURCES/ git clone git://git.sugarlabs.org/$PACKAGE/mainline.git ~/rpmbuild/SOURCES/$PACKAGE-$VERSION cd ~/rpmbuild/SOURCES/$PACKAGE-$VERSION @@ -92,7 +90,7 @@ do log=$(patch -N -t -F$FUZZ --dry-run -p1 < $i 2>&1) if [ $? = 0 ] then - echo APPLYED PATCH: $file | tee -a ~/rpmbuild/RPMS/$PACKAGE-$VERSION.appliedpatches + echo APPLIED PATCH: $file | tee -a ~/rpmbuild/RPMS/$PACKAGE-$VERSION.appliedpatches patch -F$FUZZ -p1 < $i cp $i ~/rpmbuild/SOURCES/ addpatch $number .$number "$file" 1 |