null+****@clear*****
null+****@clear*****
2012年 7月 29日 (日) 00:52:53 JST
Kouhei Sutou 2012-07-29 00:52:53 +0900 (Sun, 29 Jul 2012) New Revision: 255cf8004e80bdc0ef0a42c3ba48513ac33c0687 https://github.com/groonga/groonga/commit/255cf8004e80bdc0ef0a42c3ba48513ac33c0687 Log: yum: don't require rpmdev-setuptree Modified files: packages/yum/build-rpm.sh Modified: packages/yum/build-rpm.sh (+23 -5) =================================================================== --- packages/yum/build-rpm.sh 2012-07-29 00:00:55 +0900 (844421c) +++ packages/yum/build-rpm.sh 2012-07-29 00:52:53 +0900 (279f1ea) @@ -88,10 +88,16 @@ if ! rpm -q mecab-devel > /dev/null; then base=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS srpm=\$1 -rm -rf rpmbuild +cat <<EOM > ~/.rpmmacros +%_topdir \$HOME/rpmbuild +EOM -rm -rf .rpmmacros -rpmdev-setuptree +rm -rf rpmbuild +mkdir -p rpmbuild/SOURCES +mkdir -p rpmbuild/SPECS +mkdir -p rpmbuild/BUILD +mkdir -p rpmbuild/RPMS +mkdir -p rpmbuild/SRPMS mkdir -p dependencies/RPMS mkdir -p dependencies/SRPMS @@ -127,8 +133,20 @@ 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 + + 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$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download