HAYASHI Kentaro
null+****@clear*****
Mon Aug 20 18:56:45 JST 2012
HAYASHI Kentaro 2012-08-20 18:56:45 +0900 (Mon, 20 Aug 2012) New Revision: 7ac17cb5565c38e054dfcea2ce9ba37cb680a820 https://github.com/groonga/groonga/commit/7ac17cb5565c38e054dfcea2ce9ba37cb680a820 Log: rpm: fix dependency for common meta package Modified files: packages/rpm/centos/groonga.spec.in packages/rpm/fedora/groonga.spec.in Modified: packages/rpm/centos/groonga.spec.in (+4 -2) =================================================================== --- packages/rpm/centos/groonga.spec.in 2012-08-17 16:29:32 +0900 (9da07cd) +++ packages/rpm/centos/groonga.spec.in 2012-08-20 18:56:45 +0900 (5b3a9c6) @@ -59,7 +59,7 @@ This package provides common settings for server use Summary: Groonga server Group: Applications/Text License: LGPLv2 and (MIT or GPLv2) -Requires: %{name} = %{version}-%{release} +Requires: %{name}-server-common = %{version}-%{release} Requires: curl Requires(pre): shadow-utils Requires(post): /sbin/chkconfig @@ -67,6 +67,7 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service Obsoletes: %{name} < 1.2.2-0 +Obsoletes: %{name}-server < 2.0.6-0 %description server This package contains the groonga server @@ -75,7 +76,8 @@ This package contains the groonga server Summary: Groonga HTTP server Group: Applications/Text License: LGPLv2 and BSD -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-server-common = %{version}-%{release} +Obsoletes: %{name}-httpd < 2.0.6-0 %description httpd This package contains the groonga HTTP server Modified: packages/rpm/fedora/groonga.spec.in (+4 -2) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2012-08-17 16:29:32 +0900 (4ea9f00) +++ packages/rpm/fedora/groonga.spec.in 2012-08-20 18:56:45 +0900 (4c66168) @@ -58,13 +58,14 @@ This package provides common settings for server use Summary: Groonga server Group: Applications/Text License: LGPLv2 and (MIT or GPLv2) -Requires: %{name} = %{version}-%{release} +Requires: %{name}-server-common = %{version}-%{release} Requires: curl Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service +Obsoletes: %{name}-server < 2.0.6-0 %description server This package contains the groonga server @@ -73,7 +74,8 @@ This package contains the groonga server Summary: Groonga HTTP server Group: Applications/Text License: LGPLv2 and BSD -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-server-common = %{version}-%{release} +Obsoletes: %{name}-httpd < 2.0.6-0 %description httpd This package contains the groonga HTTP server -------------- next part -------------- HTML����������������������������...Download