[Fedora-i18n-bugs] [groonga/f16: 13/13] Merge branch 'f17' into f16

[Daiki Ueno]

commit 7fb87ac46628e6446879e4dd18a45a82206d8439
Merge: 8014260 8b57713
Author: Daiki Ueno <ueno(a)unixuser.org&gt;
Date:   Thu Mar 1 12:55:02 2012 +0900

    Merge branch 'f17' into f16

 .gitignore   |    1 +
 groonga.spec |   26 ++++++++++++++++++--------
 sources      |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
---
diff --cc groonga.spec
index 6d04984,22a3a18..7584080
--- a/groonga.spec
+++ b/groonga.spec
@@@ -22,8 -22,10 +22,7 @@@ BuildRequires:	rub
  Requires:	%{name}-libs = %{version}-%{release}
  Requires:	%{name}-plugin-suggest = %{version}-%{release}
  Requires:	%{name}-tokenizer-mecab = %{version}-%{release}
- Obsoletes:	%{name} < 1.2.2-0
- ExclusiveArch:  %{ix86} x86_64
 -Requires(post):	systemd-units
 -Requires(preun):	systemd-units
 -Requires(postun):	systemd-units
+ ExclusiveArch:		%{ix86} x86_64
  
  %description
  Groonga is an embeddable full-text search engine library.  It can
@@@ -268,10 -277,10 +265,10 @@@ f
  %defattr(-,root,root,-)
  %config(noreplace) %{_sysconfdir}/groonga/
  %config(noreplace) %{_sysconfdir}/sysconfig/groonga
 -%dir %{_unitdir}/groonga.service
 +%{_initddir}/*
  %ghost %dir %{_localstatedir}/run/%{name}
- %attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
- %attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
+ %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
+ %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
  
  %files doc
  %defattr(-,root,root,-)
@@@ -312,8 -321,23 +309,18 @@@
  %{php_extdir}/groonga.so
  
  %changelog
+ * Thu Mar  1 2012 Daiki Ueno <dueno(a)redhat.com&gt; - 2.0.0-1
+ - built in Fedora
+ 
+ * Wed Feb 29 2012 Kouhei Sutou <kou(a)clear-code.com&gt; - 2.0.0-0
+ - new upstream release.
+ - remove other permission from DB directory.
+ - use HTTP as the default protocol.
+ - support effective user and group in systemd.
+   Patch by Daiki Ueno. Thanks!!!
+ 
 -* Thu Feb  2 2012 Daiki Ueno <dueno(a)redhat.com&gt; - 1.3.0-2
 -- fix systemd service file
 -
 -* Mon Jan 30 2012 Daiki Ueno <dueno(a)redhat.com&gt; - 1.3.0-1
 -- built in Fedora
 -- migrate groonga-server initscript to systemd service (#781503)
 -- add groonga-php5.4.patch to compile PHP extension with PHP 5.4
 +* Wed Feb  1 2012 Daiki Ueno <dueno(a)redhat.com&gt; - 1.3.0-1
 +- build in fedora
  
  * Sun Jan 29 2012 Kouhei Sutou <kou(a)clear-code.com&gt; - 1.3.0-0
  - new upstream release.