[milter-manager-commit] milter-manager/milter-manager@b4ff05b [master] package yum: Separate build process

[Kenji O. <ok...@cl...>]

Kenji Okimoto	2013-04-26 17:34:08 +0900 (Fri, 26 Apr 2013)

  New Revision: b4ff05bdc9123fca251a8e5d4ecdeb4934ef7ef1
  https://github.com/milter-manager/milter-manager/commit/b4ff05bdc9123fca251a8e5d4ecdeb4934ef7ef1

  Message:
    package yum: Separate build process
    
    Bacause I don't want to use `sudo`.

  Modified files:
    package/yum/build-rpm.sh

  Modified: package/yum/build-rpm.sh (+29 -4)
===================================================================
--- package/yum/build-rpm.sh    2013-04-26 17:21:07 +0900 (0cc88f8)
+++ package/yum/build-rpm.sh    2013-04-26 17:34:08 +0900 (e6c41d1)
@@ -11,6 +11,7 @@ USE_RPMFORGE=$(cat /tmp/build-use-rpmforge)
 USE_ATRPMS=$(cat /tmp/build-use-atrpms)
 BUILD_OPTIONS=$(cat /tmp/build-options)
 BUILD_SCRIPT=/tmp/build-${PACKAGE}.sh
+BUILD_RUBY_SCRIPT=/tmp/build-ruby.sh
 
 run()
 {
@@ -86,9 +87,15 @@ if ! id $USER_NAME >/dev/null 2>&1; then
     run useradd -m $USER_NAME
 fi
 
-cat <<EOF > $BUILD_SCRIPT
-#!/bin/sh
+case $distribution_version in
+    6.*)
+	if ! rpm -q ruby1.9 > /dev/null 2>&1; then
+	    yum install wget libyaml libyaml-devel -y
+	fi
+	;;
+esac
 
+cat <<EOF > $BUILD_RUBY_SCRIPT
 if [ ! -f ~/.rpmmacros ]; then
     cat <<EOM > ~/.rpmmacros
 %_topdir \$HOME/rpm
@@ -105,14 +112,32 @@ mkdir -p rpm/SRPMS
 case $distribution_version in
   6.*)
     if ! rpm -q ruby1.9 > /dev/null 2>&1; then
-      yum install wget libyaml libyaml-devel -y
       wget ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p392.tar.gz -P rpm/SOURCES
       cp -a /tmp/ruby193.spec rpm/SPECS/ruby193.spec
       rpmbuild -ba rpm/SPECS/ruby193.spec
-      sudo rpm -Uvh rpm/RPMS/*/*.rpm
     fi
     ;;
 esac
+EOF
+
+run chmod +x $BUILD_RUBY_SCRIPT
+run su - $USER_NAME $BUILD_RUBY_SCRIPT
+run rpm -Uvh ~$USER_NAME/rpm/RPMS/*/*.rpm
+
+cat <<EOF > $BUILD_SCRIPT
+#!/bin/sh
+
+if [ ! -f ~/.rpmmacros ]; then
+    cat <<EOM > ~/.rpmmacros
+%_topdir \$HOME/rpm
+EOM
+fi
+
+mkdir -p rpm/SOURCES
+mkdir -p rpm/SPECS
+mkdir -p rpm/BUILD
+mkdir -p rpm/RPMS
+mkdir -p rpm/SRPMS
 
 if test -f /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then
     if ! rpm -Uvh /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then