Kouhei Sutou
null+****@clear*****
Fri Apr 22 13:42:00 JST 2016
Kouhei Sutou 2016-04-22 13:42:00 +0900 (Fri, 22 Apr 2016) New Revision: 612f78c11c85b073d39920d1b5ae5fd5d1dbc3f6 https://github.com/groonga/groonga/commit/612f78c11c85b073d39920d1b5ae5fd5d1dbc3f6 Message: Support --with-package-platform=centos${V} Modified files: configure.ac data/init.d/centos/Makefile.am data/init.d/centos/sysconfig/Makefile.am data/logrotate.d/centos/Makefile.am data/systemd/Makefile.am packages/rpm/centos/groonga.spec.in Renamed files: data/systemd/cetnos/Makefile.am (from data/systemd/fedora/Makefile.am) data/systemd/cetnos/groonga-httpd.service (from data/systemd/fedora/groonga-httpd.service) data/systemd/cetnos/groonga-server-gqtp.service (from data/systemd/fedora/groonga-server-gqtp.service) data/systemd/cetnos/groonga-server-http.service (from data/systemd/fedora/groonga-server-http.service) data/systemd/cetnos/sysconfig/Makefile.am (from data/systemd/fedora/sysconfig/Makefile.am) data/systemd/cetnos/sysconfig/groonga-server-gqtp (from data/systemd/fedora/sysconfig/groonga-server-gqtp) data/systemd/cetnos/sysconfig/groonga-server-http (from data/systemd/fedora/sysconfig/groonga-server-http) Modified: configure.ac (+17 -5) =================================================================== --- configure.ac 2016-04-22 11:59:49 +0900 (1f54c75) +++ configure.ac 2016-04-22 13:42:00 +0900 (3942982) @@ -1369,15 +1369,27 @@ AC_MSG_CHECKING([whether package platform]) AC_ARG_WITH(package-platform, [AS_HELP_STRING([--with-package-platform=PLATFORM], [install package platform related files. [default=no] - (supported package platforms: centos, fedora)])], + (supported package platforms: centos, centos5, centos6, centos7, fedora)])], [package_platform="$withval"], [package_platform="no"]) +if test "$package_platform" = "centos"; then + distribution=$(cut -d " " -f 1 /etc/redhat-release | tr "A-Z" "a-z") + if grep -q Linux /etc/redhat-release; then + distribution_version=$(cut -d " " -f 4 /etc/redhat-release) + else + distribution_version=$(cut -d " " -f 3 /etc/redhat-release) + fi + distribution_version=$(echo ${distribution_version} | sed -e 's/\..*$//g') + package_platform="${package_platform}${distribution_version}" +fi AC_MSG_RESULT($package_platform) -AM_CONDITIONAL([CENTOS_PLATFORM], - [test "${package_platform}" = "centos"]) -AM_CONDITIONAL([FEDORA_PLATFORM], - [test "${package_platform}" = "fedora"]) +AM_CONDITIONAL([CENTOS_INIT_PLATFORM], + [test "${package_platform}" = "centos5" || + test "${package_platform}" = "centos6"]) +AM_CONDITIONAL([CENTOS_SYSTEMD_PLATFORM], + [test "${package_platform}" = "centos7" || + test "${package_platform}" = "fedora"]) # plugins check relative_pluginsdir_base="\$(PACKAGE)/plugins" Modified: data/init.d/centos/Makefile.am (+1 -1) =================================================================== --- data/init.d/centos/Makefile.am 2016-04-22 11:59:49 +0900 (8031a39) +++ data/init.d/centos/Makefile.am 2016-04-22 13:42:00 +0900 (afd2633) @@ -2,7 +2,7 @@ SUBDIRS = sysconfig scripts = groonga-server-http groonga-server-gqtp groonga-httpd -if CENTOS_PLATFORM +if CENTOS_INIT_PLATFORM initdir = $(sysconfdir)/init.d dist_init_SCRIPTS = $(scripts) else Modified: data/init.d/centos/sysconfig/Makefile.am (+1 -1) =================================================================== --- data/init.d/centos/sysconfig/Makefile.am 2016-04-22 11:59:49 +0900 (5f78afb) +++ data/init.d/centos/sysconfig/Makefile.am 2016-04-22 13:42:00 +0900 (9a95593) @@ -1,6 +1,6 @@ data = groonga-server-gqtp groonga-server-http groonga-httpd -if CENTOS_PLATFORM +if CENTOS_INIT_PLATFORM sysconfigdir = $(sysconfdir)/sysconfig dist_sysconfig_DATA = $(data) else Modified: data/logrotate.d/centos/Makefile.am (+1 -1) =================================================================== --- data/logrotate.d/centos/Makefile.am 2016-04-22 11:59:49 +0900 (fe12186) +++ data/logrotate.d/centos/Makefile.am 2016-04-22 13:42:00 +0900 (c4b4ca8) @@ -1,6 +1,6 @@ logrotate_conf = groonga-server-gqtp groonga-server-http groonga-httpd -if CENTOS_PLATFORM +if CENTOS_INIT_PLATFORM logrotatedir = $(sysconfdir)/logrotate.d dist_logrotate_DATA = $(logrotate_conf) else Modified: data/systemd/Makefile.am (+1 -1) =================================================================== --- data/systemd/Makefile.am 2016-04-22 11:59:49 +0900 (5e83c67) +++ data/systemd/Makefile.am 2016-04-22 13:42:00 +0900 (0943295) @@ -1 +1 @@ -SUBDIRS = fedora +SUBDIRS = centos Renamed: data/systemd/cetnos/Makefile.am (+1 -1) 89% =================================================================== --- data/systemd/fedora/Makefile.am 2016-04-22 11:59:49 +0900 (97caba3) +++ data/systemd/cetnos/Makefile.am 2016-04-22 13:42:00 +0900 (1366c26) @@ -5,7 +5,7 @@ services = \ groonga-server-gqtp.service \ groonga-httpd.service -if FEDORA_PLATFORM +if CENTOS_SYSTEMD_PLATFORM unitdir = /usr/lib/systemd/system dist_unit_DATA = $(services) else Renamed: data/systemd/cetnos/groonga-httpd.service (+0 -0) 100% =================================================================== Renamed: data/systemd/cetnos/groonga-server-gqtp.service (+0 -0) 100% =================================================================== Renamed: data/systemd/cetnos/groonga-server-http.service (+0 -0) 100% =================================================================== Renamed: data/systemd/cetnos/sysconfig/Makefile.am (+1 -1) 84% =================================================================== --- data/systemd/fedora/sysconfig/Makefile.am 2016-04-22 11:59:49 +0900 (5de8250) +++ data/systemd/cetnos/sysconfig/Makefile.am 2016-04-22 13:42:00 +0900 (6d33ae1) @@ -1,6 +1,6 @@ data = groonga-server-http groonga-server-gqtp -if FEDORA_PLATFORM +if CENTOS_SYSTEMD_PLATFORM sysconfigdir = $(sysconfdir)/sysconfig dist_sysconfig_DATA = $(data) else Renamed: data/systemd/cetnos/sysconfig/groonga-server-gqtp (+0 -0) 100% =================================================================== Renamed: data/systemd/cetnos/sysconfig/groonga-server-http (+0 -0) 100% =================================================================== Modified: packages/rpm/centos/groonga.spec.in (+3 -1) =================================================================== --- packages/rpm/centos/groonga.spec.in 2016-04-22 11:59:49 +0900 (0b33541) +++ packages/rpm/centos/groonga.spec.in 2016-04-22 13:42:00 +0900 (86810c7) @@ -1,3 +1,5 @@ +%{!?centos_ver:%define centos_ver 7} + %{!?use_lz4:%define use_lz4 0} %{!?use_mecab:%define use_mecab 1} %{!?use_jemalloc:%define use_jemalloc 0} @@ -177,7 +179,7 @@ Munin plugins for Groonga %build %configure \ --disable-static \ - --with-package-platform=centos \ + --with-package-platform=centos%{?centos_ver} \ %if %{!use_lz4} --without-lz4 \ %endif -------------- next part -------------- HTML����������������������������...Download
