Kouhei Sutou
null+****@clear*****
Sat Nov 14 17:16:04 JST 2015
Kouhei Sutou 2015-11-14 17:16:04 +0900 (Sat, 14 Nov 2015) New Revision: da0004ad3b767ec33fe6ec27607dc5b2ff4a32cc https://github.com/groonga/groonga/commit/da0004ad3b767ec33fe6ec27607dc5b2ff4a32cc Message: Use LABEL instead of TITLE Modified files: configure.ac packages/yum/Makefile.am packages/yum/build-release-rpm.sh Modified: configure.ac (+2 -2) =================================================================== --- configure.ac 2015-11-13 17:08:21 +0900 (05a9af5) +++ configure.ac 2015-11-14 17:16:04 +0900 (5982d86) @@ -7,8 +7,8 @@ AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([foreign tar-pax subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -PACKAGE_TITLE=Groonga -AC_SUBST(PACKAGE_TITLE) +PACKAGE_LABEL=Groonga +AC_SUBST(PACKAGE_LABEL) # for Autoconf 2.60 or earlier. if test -z "${datarootdir}"; then Modified: packages/yum/Makefile.am (+1 -1) =================================================================== --- packages/yum/Makefile.am 2015-11-13 17:08:21 +0900 (6c4220c) +++ packages/yum/Makefile.am 2015-11-14 17:16:04 +0900 (b60a91a) @@ -54,7 +54,7 @@ build-in-vm: source specs env.sh build-release-rpm: RPM-GPG-KEY-$(PACKAGE) ./build-release-rpm.sh \ $(PACKAGE) \ - '$(PACKAGE_TITLE)' \ + '$(PACKAGE_LABEL)' \ $(BASE_URL_PREFIX) \ $(REPOSITORIES_PATH)/ \ '$(DISTRIBUTIONS)' \ Modified: packages/yum/build-release-rpm.sh (+5 -5) =================================================================== --- packages/yum/build-release-rpm.sh 2015-11-13 17:08:21 +0900 (f606c5d) +++ packages/yum/build-release-rpm.sh 2015-11-14 17:16:04 +0900 (7b60778) @@ -3,13 +3,13 @@ script_base_dir=`dirname $0` if [ $# != 6 ]; then - echo "Usage: $0 PACKAGE PACKAGE_TITLE BASE_URL_PREFIX DESTINATION DISTRIBUTIONS HAVE_DEVELOPMENT_BRANCH" + echo "Usage: $0 PACKAGE PACKAGE_LABEL BASE_URL_PREFIX DESTINATION DISTRIBUTIONS HAVE_DEVELOPMENT_BRANCH" echo " e.g.: $0 milter-manager 'milter manager' http://downloads.sourceforge.net/milter-manager' repositories/ 'fedora centos' yes" exit 1 fi PACKAGE=$1 -PACKAGE_TITLE=$2 +PACKAGE_LABEL=$2 BASE_URL_PREFIX=$3 DESTINATION=$4 DISTRIBUTIONS=$5 @@ -53,14 +53,14 @@ for distribution in ${DISTRIBUTIONS}; do if test "$HAVE_DEVELOPMENT_BRANCH" = "yes"; then run cat <<EOR > $repo [$PACKAGE] -name=$PACKAGE_TITLE for $distribution_label \$releasever - \$basearch +name=$PACKAGE_LABEL for $distribution_label \$releasever - \$basearch baseurl=$BASE_URL_PREFIX/$distribution/\$releasever/stable/\$basearch/ gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-$PACKAGE [$PACKAGE-development] -name=$PACKAGE_TITLE for $distribution_label \$releasever - development - \$basearch +name=$PACKAGE_LABEL for $distribution_label \$releasever - development - \$basearch baseurl=$BASE_URL_PREFIX/$distribution/\$releasever/development/\$basearch/ gpgcheck=1 enabled=0 @@ -69,7 +69,7 @@ EOR else run cat <<EOR > $repo [$PACKAGE] -name=$PACKAGE_TITLE for $distribution_label \$releasever - \$basearch +name=$PACKAGE_LABEL for $distribution_label \$releasever - \$basearch baseurl=$BASE_URL_PREFIX/$distribution/\$releasever/\$basearch/ gpgcheck=1 enabled=1 -------------- next part -------------- HTML����������������������������... 下載