[Groonga-mysql-commit] mroonga/mroonga at 3cfb1d6 [master] rpm: specify correct RPMS directory on i386 architecture

Back to archive index

HAYASHI Kentaro null+****@clear*****
Wed Mar 26 18:43:23 JST 2014


HAYASHI Kentaro	2014-03-26 18:43:23 +0900 (Wed, 26 Mar 2014)

  New Revision: 3cfb1d68e200162b9ed27b1dfd6db5b59c159c65
  https://github.com/mroonga/mroonga/commit/3cfb1d68e200162b9ed27b1dfd6db5b59c159c65

  Message:
    rpm: specify correct RPMS directory on i386 architecture

  Modified files:
    packages/yum/build-in-chroot.sh

  Modified: packages/yum/build-in-chroot.sh (+14 -5)
===================================================================
--- packages/yum/build-in-chroot.sh    2014-03-26 13:13:29 +0900 (1ab1411)
+++ packages/yum/build-in-chroot.sh    2014-03-26 18:43:23 +0900 (ae16e59)
@@ -94,11 +94,20 @@ build()
     build_user_dir=${base_dir}/home/${build_user}
     rpm_base_dir=${build_user_dir}/rpmbuild
     rpm_dir=${rpm_base_dir}/RPMS/${architecture}
-    if [ $distribution = "fedora" ]; then
-	if [ $architecture = "i386" ]; then
-	    rpm_dir=${rpm_base_dir}/RPMS/i686
-	fi
-    fi
+    case $distribution in
+	"fedora")
+	    if [ $architecture = "i386" ]; then
+		rpm_dir=${rpm_base_dir}/RPMS/i686
+	    fi
+	    ;;
+	"centos")
+	    if [ $distribution_version = "6" ]; then
+		if [ $architecture = "i386" ]; then
+		    rpm_dir=${rpm_base_dir}/RPMS/i686
+		fi
+	    fi
+	    ;;
+    esac
     srpm_dir=${rpm_base_dir}/SRPMS
     pool_base_dir=${DESTINATION}${distribution}/${distribution_version}
     if test "${HAVE_DEVELOPMENT_BRANCH}" = "yes"; then
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-mysql-commit mailing list
Back to archive index