[Groonga-mysql-commit] mroonga/mroonga [fix-for-visual-studio] yum: don't require rpmdev-setuptree

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Oct 4 10:44:44 JST 2012


Kouhei Sutou	2012-07-29 00:18:47 +0900 (Sun, 29 Jul 2012)

  New Revision: 96a47908663df0c62e4dd8790fe29351d13c1f9a
  https://github.com/mroonga/mroonga/commit/96a47908663df0c62e4dd8790fe29351d13c1f9a

  Merged 7874035: Merge branch 'master' of github.com:mroonga/mroonga

  Log:
    yum: don't require rpmdev-setuptree

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

  Modified: packages/yum/build-rpm.sh (+15 -2)
===================================================================
--- packages/yum/build-rpm.sh    2012-07-29 00:05:27 +0900 (3c1a324)
+++ packages/yum/build-rpm.sh    2012-07-29 00:18:47 +0900 (4dee41b)
@@ -111,8 +111,21 @@ run yum clean ${yum_options} packages
 cat <<EOF > $BUILD_SCRIPT
 #!/bin/sh
 
-rm -rf .rpmmacros
-rpmdev-setuptree
+if [ -x /usr/bin/rpmdev-setuptree ]; then
+    rm -rf .rpmmacros
+    rpmdev-setuptree
+else
+    cat <<EOM > ~/.rpmmacros
+%_topdir \$HOME/rpmbuild
+EOM
+
+    # rm -rf rpmbuild
+    mkdir -p rpmbuild/SOURCES
+    mkdir -p rpmbuild/SPECS
+    mkdir -p rpmbuild/BUILD
+    mkdir -p rpmbuild/RPMS
+    mkdir -p rpmbuild/SRPMS
+fi
 
 if test -f /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then
     if ! rpm -Uvh /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then
-------------- next part --------------
HTML����������������������������...
下載 



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