groonga-5.1.0-1, groonga-normalizer-mysql-1.1.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9841 ec354946-7b23-47d6-9f5a-488ba84defc7

g/groonga-normalizer-mysql/groonga-normalizer-mysql-vl.spec

@@ -1,8 +1,8 @@
 %global __provides_exclude_from ^%{_libdir}/groonga/plugins/normalizers/mysql\\.so$
 
 Name:		groonga-normalizer-mysql
-Version:	1.0.6
+Version:	1.1.0
-Release:	2%{?_dist_release}
+Release:	1%{?_dist_release}
 Summary:	MySQL compatible normalizer plugin for groonga
 
 Group:		Applications/Text
@@ -56,7 +56,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/groonga/plugins/*/*.la
 %{_libdir}/pkgconfig/groonga-normalizer-mysql.pc
 
 %changelog
-* Mon Mar 31 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net>  - 1.0.6-2
+* Mon Nov 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
+- new upstream release.
+
+* Mon Mar 31 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.6-2
 - rebuilt with groonga-4.0.1.
 
 * Tue Feb 11 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.6-1

g/groonga/groonga-vl.spec

@@ -3,7 +3,7 @@
 %global _initddir %{_sysconfdir}/init.d/
 
 Name:		groonga
-Version:	4.0.6
+Version:	5.1.0
 Release:	1%{?_dist_release}
 Summary:	An Embeddable Fulltext Search Engine
 
@@ -11,9 +11,6 @@ Group:		Applications/Text
 License:	LGPLv2
 URL:		http://groonga.org/
 Source0:	http://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz
-# from upstream 06fe432ad0c7eccec43f4824467e4c30e7026c7f
-# https://github.com/groonga/groonga/commit/60a00564d2e9b99c898a25e4ecb3f5c43fb8cf97
-#Patch1:		groonga-3.0.0-06fe432a.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:	mecab-devel
@@ -76,7 +73,7 @@ Obsoletes:	%{name}-server < 2.0.7-0
 This package contains the groonga GQTP server
 
 %package server-http
-Summary:	Groonga HTTP server (stable)
+Summary:	Groonga HTTP server (transitional)
 Group:		Applications/Text
 License:	LGPLv2
 Requires:	%{name}-server-common = %{version}-%{release}
@@ -90,14 +87,15 @@ Obsoletes:	%{name} < 1.2.2-0
 Obsoletes:	%{name}-server < 2.0.7-0
 
 %description server-http
-This package contains the groonga HTTP server
+This is a transitional package to groonga-httpd.
 
 %package httpd
-Summary:	Groonga HTTP server (experimental)
+Summary:	Groonga HTTP server
 Group:		Applications/Text
 License:	LGPLv2 and BSD
 Requires:	%{name}-server-common = %{version}-%{release}
-Conflicts:	%{name}-server-http
+Provides:	%{name}-server-http = %{version}-%{release}
+Obsoletes:	%{name}-server-http <= 4.0.7-2
 
 %description httpd
 This package contains the groonga HTTP server. It is experimental
@@ -110,34 +108,34 @@ Group:		Documentation
 License:	LGPLv2 and BSD
 
 %description doc
-Documentation for groonga
+Documentation for Groonga
 
 %package devel
-Summary:	Libraries and header files for groonga
+Summary:	Libraries and header files for Groonga
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
-Libraries and header files for groonga
+Libraries and header files for Groonga
 
 %package tokenizer-mecab
-Summary:	MeCab tokenizer for groonga
+Summary:	MeCab tokenizer for Groonga
 Group:		Applications/Text
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description tokenizer-mecab
-MeCab tokenizer for groonga
+MeCab tokenizer for Groonga
 
 %package plugin-suggest
-Summary:	Suggest plugin for groonga
+Summary:	Suggest plugin for Groonga
 Group:		Applications/Text
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description plugin-suggest
-Sugget plugin for groonga
+Sugget plugin for Groonga
 
 %package munin-plugins
-Summary:	Munin plugins for groonga
+Summary:	Munin plugins for Groonga
 Group:		Applications/System
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	munin-node
@@ -146,12 +144,11 @@ Requires(post):	/sbin/service
 Requires(postun):	/sbin/service
 
 %description munin-plugins
-Munin plugins for groonga
+Munin plugins for Groonga
 
 %prep
 #% define optflags -O0
 %setup -q
-#%patch1 -p 1
 
 %build
 %configure \
@@ -161,7 +158,10 @@ Munin plugins for groonga
 %if %{use_lzo}
   --with-lzo \
 %endif
-  --with-munin-plugins
+  --with-mecab \
+  --with-munin-plugins \
+  --enable-mruby
+
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -185,11 +185,26 @@ cat <<EOC > $RPM_BUILD_ROOT%{_sysconfdir}/munin/plugin-conf.d/groonga
   user groonga
   group groonga
   env.PATH %{_bindir}
-  env.pid_file %{_localstatedir}/run/groonga/groonga.pid
+  env.database_path %{_localstatedir}/lib/groonga/db/db
-  env.path %{_localstatedir}/lib/groonga/db/db
   env.host 127.0.0.1
-  env.port 10041
+
-  env.log_path %{_localstatedir}/log/groonga/query.log
+  env.http_host 127.0.0.1
+  env.http_port 10041
+  env.http_database_path %{_localstatedir}/lib/groonga/db/db
+  env.http_pid_path %{_localstatedir}/run/groonga/groonga-http.pid
+  env.http_query_log_path %{_localstatedir}/log/groonga/query-http.log
+
+  env.httpd_host 127.0.0.1
+  env.httpd_port 10041
+  env.httpd_database_path %{_localstatedir}/lib/groonga/db/db
+  env.httpd_pid_path %{_localstatedir}/run/groonga/groonga-httpd.pid
+  env.httpd_query_log_path %{_localstatedir}/log/groonga/httpd/groonga-query.log
+
+  env.gqtp_host 127.0.0.1
+  env.gqtp_port 10043
+  env.gqtp_database_path %{_localstatedir}/lib/groonga/db/db
+  env.gqtp_pid_path %{_localstatedir}/run/groonga/groonga-gqtp.pid
+  env.gqtp_query_log_path %{_localstatedir}/log/groonga/query-gqtp.log
 EOC
 
 %clean
@@ -198,7 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 %pre server-common
 getent group groonga >/dev/null || groupadd -r groonga
 getent passwd groonga >/dev/null || \
-	useradd -r -g groonga -d %{_localstatedir}/lib/groonga -s /sbin/nologin \
+       useradd -r -g groonga -d %{_localstatedir}/lib/groonga -s /sbin/nologin \
 	-c 'groonga' groonga
 if [ $1 = 1 ]; then
 	mkdir -p %{_localstatedir}/lib/groonga/db
@@ -274,16 +289,41 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %{_datadir}/man/*/man1/*
 %{_bindir}/groonga
 %{_bindir}/groonga-benchmark
+%{_bindir}/grndb
 
 %files libs
 %defattr(-,root,root,-)
-%doc README AUTHORS COPYING
+%doc README.md COPYING
 %{_libdir}/*.so.*
 %dir %{_libdir}/groonga
 %dir %{_libdir}/groonga/plugins
+%dir %{_libdir}/groonga/plugins/functions
 %dir %{_libdir}/groonga/plugins/tokenizers
+%dir %{_libdir}/groonga/plugins/token_filters
+%dir %{_libdir}/groonga/plugins/ruby
+%dir %{_libdir}/groonga/plugins/sharding
+%dir %{_libdir}/groonga/plugins/expression_rewriters
+%dir %{_libdir}/groonga/scripts
+%dir %{_libdir}/groonga/scripts/ruby
+%dir %{_libdir}/groonga/scripts/ruby/command_line
+%dir %{_libdir}/groonga/scripts/ruby/context
+%dir %{_libdir}/groonga/scripts/ruby/initialize
+%dir %{_libdir}/groonga/scripts/ruby/logger
+%dir %{_libdir}/groonga/scripts/ruby/query_logger
+%{_libdir}/groonga/plugins/functions/vector.so
 %{_libdir}/groonga/plugins/table/table.so
 %{_libdir}/groonga/plugins/query_expanders/tsv.so
+%{_libdir}/groonga/plugins/token_filters/stop_word.so
+%{_libdir}/groonga/plugins/ruby/*.so
+%{_libdir}/groonga/plugins/*.rb
+%{_libdir}/groonga/plugins/sharding/*.rb
+%{_libdir}/groonga/plugins/expression_rewriters/*.rb
+%{_libdir}/groonga/scripts/ruby/*.rb
+%{_libdir}/groonga/scripts/ruby/command_line/*.rb
+%{_libdir}/groonga/scripts/ruby/context/*.rb
+%{_libdir}/groonga/scripts/ruby/initialize/*.rb
+%{_libdir}/groonga/scripts/ruby/logger/*.rb
+%{_libdir}/groonga/scripts/ruby/query_logger/*.rb
 %{_datadir}/groonga/
 %config(noreplace) %{_sysconfdir}/groonga/synonyms.tsv
 
@@ -317,10 +357,13 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %{_initddir}/groonga-httpd
 %{_sbindir}/groonga-httpd
 %{_sbindir}/groonga-httpd-restart
+%ghost %dir %{_localstatedir}/run/%{name}
+%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
+%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
 
 %files doc
 %defattr(-,root,root,-)
-%doc README AUTHORS COPYING
+%doc README.md COPYING
 %doc groonga-doc/*
 
 %files devel
@@ -345,6 +388,9 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/*
 
 %changelog
+* Mon Nov 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.1.0-1
+- new upstream release.
+
 * Mon Sep 29 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.6-1
 - new upstream release.