Kouhei Sutou
null+****@clear*****
Fri Apr 22 11:59:49 JST 2016
Kouhei Sutou 2016-04-22 11:59:49 +0900 (Fri, 22 Apr 2016) New Revision: 9ad2e325aff4242b4fe74a7a21076568bc397f6f https://github.com/groonga/groonga/commit/9ad2e325aff4242b4fe74a7a21076568bc397f6f Message: Use "centos" instead of "redhat" Modified files: configure.ac data/init.d/Makefile.am data/logrotate.d/Makefile.am packages/rpm/centos/groonga.spec.in Renamed files: data/init.d/centos/Makefile.am (from data/init.d/redhat/Makefile.am) data/init.d/centos/groonga-httpd (from data/init.d/redhat/groonga-httpd) data/init.d/centos/groonga-server-gqtp (from data/init.d/redhat/groonga-server-gqtp) data/init.d/centos/groonga-server-http (from data/init.d/redhat/groonga-server-http) data/init.d/centos/sysconfig/Makefile.am (from data/init.d/redhat/sysconfig/Makefile.am) data/init.d/centos/sysconfig/groonga-httpd (from data/init.d/redhat/sysconfig/groonga-httpd) data/init.d/centos/sysconfig/groonga-server-gqtp (from data/init.d/redhat/sysconfig/groonga-server-gqtp) data/init.d/centos/sysconfig/groonga-server-http (from data/init.d/redhat/sysconfig/groonga-server-http) data/logrotate.d/centos/Makefile.am (from data/logrotate.d/redhat/Makefile.am) data/logrotate.d/centos/groonga-httpd (from data/logrotate.d/redhat/groonga-httpd) data/logrotate.d/centos/groonga-server-gqtp (from data/logrotate.d/redhat/groonga-server-gqtp) data/logrotate.d/centos/groonga-server-http (from data/logrotate.d/redhat/groonga-server-http) Modified: configure.ac (+6 -6) =================================================================== --- configure.ac 2016-04-22 11:52:45 +0900 (5c297df) +++ configure.ac 2016-04-22 11:59:49 +0900 (1f54c75) @@ -284,10 +284,10 @@ AC_CONFIG_FILES([ data/html/Makefile data/munin/Makefile data/init.d/Makefile - data/init.d/redhat/Makefile - data/init.d/redhat/sysconfig/Makefile + data/init.d/centos/Makefile + data/init.d/centos/sysconfig/Makefile data/logrotate.d/Makefile - data/logrotate.d/redhat/Makefile + data/logrotate.d/centos/Makefile data/systemd/Makefile data/systemd/fedora/Makefile data/systemd/fedora/sysconfig/Makefile @@ -1369,13 +1369,13 @@ 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: redhat, fedora)])], + (supported package platforms: centos, fedora)])], [package_platform="$withval"], [package_platform="no"]) AC_MSG_RESULT($package_platform) -AM_CONDITIONAL([REDHAT_PLATFORM], - [test "${package_platform}" = "redhat"]) +AM_CONDITIONAL([CENTOS_PLATFORM], + [test "${package_platform}" = "centos"]) AM_CONDITIONAL([FEDORA_PLATFORM], [test "${package_platform}" = "fedora"]) Modified: data/init.d/Makefile.am (+1 -1) =================================================================== --- data/init.d/Makefile.am 2016-04-22 11:52:45 +0900 (5a641a9) +++ data/init.d/Makefile.am 2016-04-22 11:59:49 +0900 (0943295) @@ -1 +1 @@ -SUBDIRS = redhat +SUBDIRS = centos Renamed: data/init.d/centos/Makefile.am (+1 -1) 90% =================================================================== --- data/init.d/redhat/Makefile.am 2016-04-22 11:52:45 +0900 (d63922a) +++ data/init.d/centos/Makefile.am 2016-04-22 11:59:49 +0900 (8031a39) @@ -2,7 +2,7 @@ SUBDIRS = sysconfig scripts = groonga-server-http groonga-server-gqtp groonga-httpd -if REDHAT_PLATFORM +if CENTOS_PLATFORM initdir = $(sysconfdir)/init.d dist_init_SCRIPTS = $(scripts) else Renamed: data/init.d/centos/groonga-httpd (+0 -0) 100% =================================================================== Renamed: data/init.d/centos/groonga-server-gqtp (+0 -0) 100% =================================================================== Renamed: data/init.d/centos/groonga-server-http (+0 -0) 100% =================================================================== Renamed: data/init.d/centos/sysconfig/Makefile.am (+1 -1) 89% =================================================================== --- data/init.d/redhat/sysconfig/Makefile.am 2016-04-22 11:52:45 +0900 (44b47bb) +++ data/init.d/centos/sysconfig/Makefile.am 2016-04-22 11:59:49 +0900 (5f78afb) @@ -1,6 +1,6 @@ data = groonga-server-gqtp groonga-server-http groonga-httpd -if REDHAT_PLATFORM +if CENTOS_PLATFORM sysconfigdir = $(sysconfdir)/sysconfig dist_sysconfig_DATA = $(data) else Renamed: data/init.d/centos/sysconfig/groonga-httpd (+0 -0) 100% =================================================================== Renamed: data/init.d/centos/sysconfig/groonga-server-gqtp (+0 -0) 100% =================================================================== Renamed: data/init.d/centos/sysconfig/groonga-server-http (+0 -0) 100% =================================================================== Modified: data/logrotate.d/Makefile.am (+1 -1) =================================================================== --- data/logrotate.d/Makefile.am 2016-04-22 11:52:45 +0900 (5a641a9) +++ data/logrotate.d/Makefile.am 2016-04-22 11:59:49 +0900 (0943295) @@ -1 +1 @@ -SUBDIRS = redhat +SUBDIRS = centos Renamed: data/logrotate.d/centos/Makefile.am (+1 -2) 90% =================================================================== --- data/logrotate.d/redhat/Makefile.am 2016-04-22 11:52:45 +0900 (00d2c2e) +++ data/logrotate.d/centos/Makefile.am 2016-04-22 11:59:49 +0900 (fe12186) @@ -1,7 +1,6 @@ - logrotate_conf = groonga-server-gqtp groonga-server-http groonga-httpd -if REDHAT_PLATFORM +if CENTOS_PLATFORM logrotatedir = $(sysconfdir)/logrotate.d dist_logrotate_DATA = $(logrotate_conf) else Renamed: data/logrotate.d/centos/groonga-httpd (+0 -0) 100% =================================================================== Renamed: data/logrotate.d/centos/groonga-server-gqtp (+0 -0) 100% =================================================================== Renamed: data/logrotate.d/centos/groonga-server-http (+0 -0) 100% =================================================================== Modified: packages/rpm/centos/groonga.spec.in (+1 -1) =================================================================== --- packages/rpm/centos/groonga.spec.in 2016-04-22 11:52:45 +0900 (f7f4431) +++ packages/rpm/centos/groonga.spec.in 2016-04-22 11:59:49 +0900 (0b33541) @@ -177,7 +177,7 @@ Munin plugins for Groonga %build %configure \ --disable-static \ - --with-package-platform=redhat \ + --with-package-platform=centos \ %if %{!use_lz4} --without-lz4 \ %endif -------------- next part -------------- HTML����������������������������...Télécharger
