null+****@clear*****
null+****@clear*****
2012年 1月 30日 (月) 02:44:04 JST
Kouhei Sutou 2012-01-30 02:44:04 +0900 (Mon, 30 Jan 2012)
New Revision: 9d5a6c7f2060d751c79622b8fb4032db71686f13
Log:
[rpm] remove compatible pacakge for 1.11 or ealier.
Modified files:
packages/rpm/centos/mysql-mroonga.spec.in
packages/rpm/fedora/mysql-mroonga.spec.in
Modified: packages/rpm/centos/mysql-mroonga.spec.in (+2 -54)
===================================================================
--- packages/rpm/centos/mysql-mroonga.spec.in 2012-01-30 02:42:05 +0900 (2b28153)
+++ packages/rpm/centos/mysql-mroonga.spec.in 2012-01-30 02:44:04 +0900 (0ff531d)
@@ -36,32 +36,12 @@ Requires: MySQL-server = %{mysql_version}-%{mysql_release}
Requires: MySQL-client = %{mysql_version}-%{mysql_release}
%endif
Obsoletes: mysql-groonga < 1.10-0
-Conflicts: mysql-mroonga-compatible
%description
Mroonga is a fast fulltext searchable storage plugin for MySQL.
It is based on groonga that is a fast fulltext search engine and
column store. Groonga is good at real-time update.
-%package compatible
-Summary: A fast fulltext searchable storage engine for MySQL.
-Group: Applications/Databases
-License: LGPLv2.1
-Conflicts: mysql-mroonga
-
-%description compatible
-This package is just provided for backward compatibility.
-
-Mroonga uses "groonga" as storage engine name before 1.20.
-But mroonga 1.20 or later uses "mroonga" as storage engine
-name. It means that 1.20 breaks backward compatibility.
-
-This package provide mroonga as "groonga" storage engine.
-You can use this package to avoid
-
-Note that this package will be remov****@1*****. So you need
-to upgrade to use "mroonga" storage engine sooner or later.
-
%package doc
Summary: Documentation for mroonga
Group: Documentation
@@ -125,6 +105,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/*groonga*
mv $RPM_BUILD_ROOT%{_datadir}/doc/mroonga/ mysql-mroonga-doc/
%clean
@@ -143,19 +124,6 @@ CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_mroonga.so';
echo " $command")
fi
-%post compatible
-if [ $1 -eq 1 ]; then
- sql="
-INSTALL PLUGIN groonga SONAME 'ha_groonga.so';
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_groonga.so';
-"
- command="/usr/bin/mysql -u root -e \"$sql\""
- echo $command
- eval $command || \
- (echo "run the following command to register mroonga:"; \
- echo " $command")
-fi
-
%postun
if [ $1 -eq 0 ]; then
sql="
@@ -169,28 +137,9 @@ UNINSTALL PLUGIN mroonga;
echo " $command")
fi
-%postun compatible
-if [ $1 -eq 0 ]; then
- sql="
-DROP FUNCTION last_insert_grn_id;
-UNINSTALL PLUGIN groonga;
-"
- command="/usr/bin/mysql -u root -e \"$sql\""
- echo $command
- eval $command || \
- (echo "run the following command to unregister mroonga:"; \
- echo " $command")
-fi
-
%files
%defattr(-,root,root,-)
-%{_libdir}/mysql/plugin/ha_mroonga.*
-%{_datadir}/man/man1/*
-%{_datadir}/man/*/man1/*
-
-%files compatible
-%defattr(-,root,root,-)
-%{_libdir}/mysql/plugin/ha_groonga.*
+%{_libdir}/mysql/plugin/
%{_datadir}/man/man1/*
%{_datadir}/man/*/man1/*
@@ -205,7 +154,6 @@ fi
- require groonga 1.3.0.
- groonga -> mroonga.
- use MySQL 5.5.20.
-- add mysql-server-mroonga-compatible.
* Thu Dec 29 2011 Kouhei Sutou <kou****@clear*****> - 1.11-0
- new upstream release.
Modified: packages/rpm/fedora/mysql-mroonga.spec.in (+2 -54)
===================================================================
--- packages/rpm/fedora/mysql-mroonga.spec.in 2012-01-30 02:42:05 +0900 (4eadf86)
+++ packages/rpm/fedora/mysql-mroonga.spec.in 2012-01-30 02:44:04 +0900 (4129e51)
@@ -21,32 +21,12 @@ Requires: groonga-libs >= %{groonga_required_version}
Requires: mysql-server
Requires: mysql
Obsoletes: mysql-groonga < 1.10-0
-Conflicts: mysql-mroonga-compatible
%description
Mroonga is a fast fulltext searchable storage plugin for MySQL.
It is based on groonga that is a fast fulltext search engine and
column store. Groonga is good at real-time update.
-%package compatible
-Summary: A fast fulltext searchable storage engine for MySQL.
-Group: Applications/Databases
-License: LGPLv2.1
-Conflicts: mysql-mroonga
-
-%description compatible
-This package is just provided for backward compatibility.
-
-Mroonga uses "groonga" as storage engine name before 1.20.
-But mroonga 1.20 or later uses "mroonga" as storage engine
-name. It means that 1.20 breaks backward compatibility.
-
-This package provide mroonga as "groonga" storage engine.
-You can use this package to avoid
-
-Note that this package will be remov****@1*****. So you need
-to upgrade to use "mroonga" storage engine sooner or later.
-
%package doc
Summary: Documentation for mroonga
Group: Documentation
@@ -79,6 +59,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/*groonga*
mv $RPM_BUILD_ROOT%{_datadir}/doc/mroonga/ mysql-mroonga-doc/
%clean
@@ -97,19 +78,6 @@ CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_mroonga.so';
echo " $command")
fi
-%post compatible
-if [ $1 -eq 1 ]; then
- sql="
-INSTALL PLUGIN groonga SONAME 'ha_groonga.so';
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_groonga.so';
-"
- command="/usr/bin/mysql -u root -e \"$sql\""
- echo $command
- eval $command || \
- (echo "run the following command to register mroonga:"; \
- echo " $command")
-fi
-
%postun
if [ $1 -eq 0 ]; then
sql="
@@ -123,28 +91,9 @@ UNINSTALL PLUGIN mroonga;
echo " $command")
fi
-%postun compatible
-if [ $1 -eq 0 ]; then
- sql="
-DROP FUNCTION last_insert_grn_id;
-UNINSTALL PLUGIN groonga;
-"
- command="/usr/bin/mysql -u root -e \"$sql\""
- echo $command
- eval $command || \
- (echo "run the following command to unregister mroonga:"; \
- echo " $command")
-fi
-
%files
%defattr(-,root,root,-)
-%{_libdir}/mysql/plugin/ha_mroonga.*
-%{_datadir}/man/man1/*
-%{_datadir}/man/*/man1/*
-
-%files compatible
-%defattr(-,root,root,-)
-%{_libdir}/mysql/plugin/ha_groonga.*
+%{_libdir}/mysql/plugin/
%{_datadir}/man/man1/*
%{_datadir}/man/*/man1/*
@@ -158,7 +107,6 @@ fi
- new upstream release.
- require groonga 1.3.0.
- groonga -> mroonga.
-- add mysql-mroonga-copmatible package for backward compatibility.
- use MySQL 5.5.19.
* Thu Dec 29 2011 Kouhei Sutou <kou****@clear*****> - 1.11-0