diff --git a/groonga-initscript.patch b/groonga-initscript.patch deleted file mode 100644 index 92ae198..0000000 --- a/groonga-initscript.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- groonga-1.0.2.orig/data/init.d/redhat/groonga 2010-09-09 14:53:26.000000000 +0900 -+++ groonga-1.0.2/data/init.d/redhat/groonga 2010-10-06 13:52:21.319175965 +0900 -@@ -2,7 +2,7 @@ - # - # /etc/rc.d/init.d/groonga - # --# chkconfig: 2345 80 20 -+# chkconfig: - 80 20 - # description: A full-text search engine and column store. - # processname: groonga - # config: /etc/sysconfig/groonga -@@ -10,7 +10,6 @@ - # - ### BEGIN INIT INFO - # Provides: groonga --# Default-Start: 2 3 4 5 - # Default-Stop: 0 1 6 - # Short-Description: groonga's init script - # Description: groonga is a full-text search engine and column store. -@@ -50,13 +49,6 @@ - fi - DAEMON_ARGS="${DAEMON_ARGS} --user ${USER}" - fi --if [ -n "${GROUP}" ]; then -- if ! getent group | grep -q "^${GROUP}:"; then -- echo "$0: group for running $prog doesn't exist: ${GROUP}" >&2 -- exit 1 -- fi -- CGROUP_DAEMON="${CGROUP_DAEMON} ${GROUP}" --fi - - if [ -n "${PIDFILE}" ]; then - mkdir -p $(dirname ${PIDFILE}) -@@ -147,8 +139,11 @@ - condrestart) - [ -f /var/lock/subsys/$prog ] && restart || : - ;; -+ status) -+ status $prog -+ ;; - *) -- echo "Usage: $prog {start|stop|reload|restart|condrestart}" -+ echo "Usage: $prog {start|stop|reload|restart|condrestart|status}" - exit 1 - ;; - esac diff --git a/groonga.spec b/groonga.spec index 01250c7..8bc0d30 100644 --- a/groonga.spec +++ b/groonga.spec @@ -9,7 +9,6 @@ Group: Applications/Text License: LGPLv2 URL: http://groonga.org/ Source0: http://groonga.org/files/groonga/groonga-%{version}.tar.gz -Patch0: groonga-initscript.patch BuildRequires: mecab-devel BuildRequires: python2-devel @@ -95,7 +94,6 @@ PHP language binding for groonga %prep #% define optflags -O0 %setup -q -%patch0 -p1 %build @@ -270,7 +268,9 @@ fi %changelog * Thu Nov 11 2010 Daiki Ueno - 1.0.3-1 -- new upstream release +- new upstream release. +- remove groonga-initscript.patch since it is included in the + upstream. * Thu Oct 7 2010 Daiki Ueno - 1.0.2-7 - own %%_localstatedir/lib/%%name/db.